From: yfr Date: Mon, 19 Jul 2004 15:33:23 +0000 (+0000) Subject: DCQ: prepare V2.0.0 X-Git-Tag: V2_0_0~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=27081a32110f254133a36b92d6379f28052409c6;p=modules%2Fvisu.git DCQ: prepare V2.0.0 --- diff --git a/doc/html/INPUT/HTML/VISU_Gen.html b/doc/html/INPUT/HTML/VISU_Gen.html deleted file mode 100644 index 13cb79ce..00000000 --- a/doc/html/INPUT/HTML/VISU_Gen.html +++ /dev/null @@ -1,1066 +0,0 @@ - - - - - - - - - - - - - - - - -
interface Base
IDL file
Python
IdType GetID ( )
return_value = GetID ( )
VISUType GetType ( )
return_value = GetType ( )

- - - - - - - -
interface PrsObject
IDL file
Python

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface Table
IDL file
Python
void SetTitle ( in string theTitle )
SetTitle ( theTitle )
string GetTitle ( )
return_value = GetTitle ( )
void SetOrientation ( in Orientation theOrientation )
SetOrientation ( theOrientation )
Orientation GetOrientation ( )
return_value = GetOrientation ( )
long GetNbRows ( )
return_value = GetNbRows ( )
long GetNbColumns ( )
return_value = GetNbColumns ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface Curve
IDL file
Python
void SetTitle ( in string theTitle )
SetTitle ( theTitle )
string GetTitle ( )
return_value = GetTitle ( )
void SetColor ( in Color theColor )
SetColor ( theColor )
Color GetColor ( )
return_value = GetColor ( )
void SetMarker ( in MarkerType theType )
SetMarker ( theType )
MarkerType GetMarker ( )
return_value = GetMarker ( )
void SetLine ( in LineType theType, in long theLineWidth )
SetLine ( theType, theLineWidth )
LineType GetLine ( )
return_value = GetLine ( )
long GetLineWidth ( )
return_value = GetLineWidth ( )

- - - - - - - - - - - - - - - - - - - - - - - -
interface Container
IDL file
Python
void AddCurve ( in Curve theCurve )
AddCurve ( theCurve )
void RemoveCurve ( in Curve theCurve )
RemoveCurve ( theCurve )
long GetNbCurves ( )
return_value = GetNbCurves ( )
void Clear ( )
Clear ( )

- - - - - - - - - - - -
interface Prs3d
IDL file
Python
void Destroy ( )
Destroy ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface Mesh
IDL file
Python
void SetCellColor ( in Color theColor )
SetCellColor ( theColor )
Color GetCellColor ( )
return_value = GetCellColor ( )
void SetNodeColor ( in Color theColor )
SetNodeColor ( theColor )
Color GetNodeColor ( )
return_value = GetNodeColor ( )
void SetLinkColor ( in Color theColor )
SetLinkColor ( theColor )
Color GetLinkColor ( )
return_value = GetLinkColor ( )
void SetPresentationType ( in PresentationType theType )
SetPresentationType ( theType )
PresentationType GetPresentationType ( )
return_value = GetPresentationType ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface ScalarMap
IDL file
Python
void SetScalarMode ( in long theScaling )
SetScalarMode ( theScaling )
long GetScalarMode ( )
return_value = GetScalarMode ( )
void SetScaling ( in Scaling theScaling )
SetScaling ( theScaling )
Scaling GetScaling ( )
return_value = GetScaling ( )
void SetRange ( in double theMin, in double theMax )
SetRange ( theMin, theMax )
double GetMin ( )
return_value = GetMin ( )
double GetMax ( )
return_value = GetMax ( )
void SetOrientation ( in Orientation theOrientation )
SetOrientation ( theOrientation )
Orientation GetOrientation ( )
return_value = GetOrientation ( )
void SetPosition ( in double X, in double Y )
SetPosition ( X, Y )
double GetPosX ( )
return_value = GetPosX ( )
double GetPosY ( )
return_value = GetPosY ( )
void SetSize ( in double theWidth, in double theHeight )
SetSize ( theWidth, theHeight )
double GetWidth ( )
return_value = GetWidth ( )
double GetHeight ( )
return_value = GetHeight ( )
void SetNbColors ( in long theNbColors )
SetNbColors ( theNbColors )
long GetNbColors ( )
return_value = GetNbColors ( )
void SetLabels ( in long theNbLabels )
SetLabels ( theNbLabels )
long GetLabels ( )
return_value = GetLabels ( )
void SetTitle ( in string theName )
SetTitle ( theName )
string GetTitle ( )
return_value = GetTitle ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface DeformedShape
IDL file
Python
void SetScale ( in double theScale )
SetScale ( theScale )
double GetScale ( )
return_value = GetScale ( )
boolean IsColored ( )
return_value = IsColored ( )
void ShowColored ( in boolean theColored )
ShowColored ( theColored )
Color GetColor ( )
return_value = GetColor ( )
void SetColor ( in Color theColor )
SetColor ( theColor )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface CutPlanes
IDL file
Python
void SetOrientationType ( in Orientation theNb )
SetOrientationType ( theNb )
Orientation GetOrientationType ( )
return_value = GetOrientationType ( )
void SetDisplacement ( in double theDisp )
SetDisplacement ( theDisp )
double GetDisplacement ( )
return_value = GetDisplacement ( )
void SetPlanePosition ( in long thePlaneNumber, in double thePlanePosition )
SetPlanePosition ( thePlaneNumber, thePlanePosition )
void SetDefault ( in long thePlaneNumber )
SetDefault ( thePlaneNumber )
double GetPlanePosition ( in long thePlaneNumber )
return_value = GetPlanePosition ( thePlaneNumber )
boolean IsDefault ( in long thePlaneNumber )
return_value = IsDefault ( thePlaneNumber )
void SetNbPlanes ( in long theNb )
SetNbPlanes ( theNb )
long GetNbPlanes ( )
return_value = GetNbPlanes ( )
void SetRotateX ( in double theAngle )
SetRotateX ( theAngle )
double GetRotateX ( )
return_value = GetRotateX ( )
void SetRotateY ( in double theAngle )
SetRotateY ( theAngle )
double GetRotateY ( )
return_value = GetRotateY ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface CutLines
IDL file
Python
void SetOrientationType ( in Orientation theNb )
SetOrientationType ( theNb )
void SetOrientationType2 ( in Orientation theNb )
SetOrientationType2 ( theNb )
Orientation GetOrientationType ( )
return_value = GetOrientationType ( )
Orientation GetOrientationType2 ( )
return_value = GetOrientationType2 ( )
void SetDisplacement ( in double theDisp )
SetDisplacement ( theDisp )
void SetDisplacement2 ( in double theDisp )
SetDisplacement2 ( theDisp )
double GetDisplacement ( )
return_value = GetDisplacement ( )
double GetDisplacement2 ( )
return_value = GetDisplacement2 ( )
void SetBasePlanePosition ( in double thePlanePosition )
SetBasePlanePosition ( thePlanePosition )
double GetBasePlanePosition ( )
return_value = GetBasePlanePosition ( )
void SetLinePosition ( in long thePlaneNumber, in double thePlanePosition )
SetLinePosition ( thePlaneNumber, thePlanePosition )
double GetLinePosition ( in long thePlaneNumber )
return_value = GetLinePosition ( thePlaneNumber )
void SetDefault ( )
SetDefault ( )
boolean IsDefault ( )
return_value = IsDefault ( )
void SetDefaultPosition ( in long thePlaneNumber )
SetDefaultPosition ( thePlaneNumber )
boolean IsDefaultPosition ( in long thePlaneNumber )
return_value = IsDefaultPosition ( thePlaneNumber )
void SetNbLines ( in long theNb )
SetNbLines ( theNb )
long GetNbLines ( )
return_value = GetNbLines ( )
void SetRotateX ( in double theAngle )
SetRotateX ( theAngle )
void SetRotateX2 ( in double theAngle )
SetRotateX2 ( theAngle )
double GetRotateX ( )
return_value = GetRotateX ( )
double GetRotateX2 ( )
return_value = GetRotateX2 ( )
void SetRotateY ( in double theAngle )
SetRotateY ( theAngle )
void SetRotateY2 ( in double theAngle )
SetRotateY2 ( theAngle )
double GetRotateY ( )
return_value = GetRotateY ( )
double GetRotateY2 ( )
return_value = GetRotateY2 ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface StreamLines
IDL file
Python
void SetDirection ( in Direction theDirection )
SetDirection ( theDirection )
Direction GetDirection ( )
return_value = GetDirection ( )
void SetStepLength ( in double theStep )
SetStepLength ( theStep )
double GetStepLength ( )
return_value = GetStepLength ( )
void SetPropagationTime ( in double theTime )
SetPropagationTime ( theTime )
double GetPropagationTime ( )
return_value = GetPropagationTime ( )
void SetIntegrationStep ( in double theStep )
SetIntegrationStep ( theStep )
double GetIntegrationStep ( )
return_value = GetIntegrationStep ( )
void SetSource ( in Prs3d thePrs3d )
SetSource ( thePrs3d )
Prs3d GetSource ( )
return_value = GetSource ( )
void SetUsedPoints ( in double thePercents )
SetUsedPoints ( thePercents )
double GetUsedPoints ( )
return_value = GetUsedPoints ( )

- - - - - - - - - - - - - - - -
interface IsoSurfaces
IDL file
Python
void SetNbSurfaces ( in long theNb )
SetNbSurfaces ( theNb )
long GetNbSurfaces ( )
return_value = GetNbSurfaces ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface Vectors
IDL file
Python
void SetLineWidth ( in double theWidth )
SetLineWidth ( theWidth )
double GetLineWidth ( )
return_value = GetLineWidth ( )
void SetGlyphType ( in GlyphType theType )
SetGlyphType ( theType )
GlyphType GetGlyphType ( )
return_value = GetGlyphType ( )
void SetGlyphPos ( in GlyphPos thePos )
SetGlyphPos ( thePos )
GlyphPos GetGlyphPos ( )
return_value = GetGlyphPos ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface Animation
IDL file
Python
void addField ( in SObject theObject )
addField ( theObject )
void generatePresentations ( in long theFieldNum )
generatePresentations ( theFieldNum )
boolean generateFrames ( )
return_value = generateFrames ( )
void clearView ( )
clearView ( )
void startAnimation ( )
startAnimation ( )
void stopAnimation ( )
stopAnimation ( )
void nextFrame ( )
nextFrame ( )
void prevFrame ( )
prevFrame ( )
void firstFrame ( )
firstFrame ( )
void lastFrame ( )
lastFrame ( )
void gotoFrame ( in long theFrame )
gotoFrame ( theFrame )
long getNbFields ( )
return_value = getNbFields ( )
long getNbFrames ( )
return_value = getNbFrames ( )
boolean isRunning ( )
return_value = isRunning ( )
long getCurrentFrame ( )
return_value = getCurrentFrame ( )
ScalarMap getPresentation ( in long theField, in long theFrame )
return_value = getPresentation ( theField, theFrame )
void setPresentationType ( in long theFieldNum, in VISUType theType )
setPresentationType ( theFieldNum, theType )
VISUType getPresentationType ( in long theFieldNum )
return_value = getPresentationType ( theFieldNum )
void setSpeed ( in long theSpeed )
setSpeed ( theSpeed )
long getSpeed ( )
return_value = getSpeed ( )
boolean isProportional ( )
return_value = isProportional ( )
void setAnimationRange ( in double theMin, in double theMax )
setAnimationRange ( theMin, theMax )
double getMinRange ( )
return_value = getMinRange ( )
double getMaxRange ( )
return_value = getMaxRange ( )
boolean isRangeDefined ( )
return_value = isRangeDefined ( )
void dumpTo ( in string thePath )
dumpTo ( thePath )
boolean isCycling ( )
return_value = isCycling ( )
double getMinTime ( )
return_value = getMinTime ( )
double getMaxTime ( )
return_value = getMaxTime ( )
void setProportional ( in boolean theProp )
setProportional ( theProp )
void setCycling ( in boolean theCycle )
setCycling ( theCycle )

- - - - - - - - - - - -
interface Result
IDL file
Python
boolean BuildAll ( )
return_value = BuildAll ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface VISU_Gen
IDL file
Python
void SetCurrentStudy ( in Study theStudy )
SetCurrentStudy ( theStudy )
Study GetCurrentStudy ( )
return_value = GetCurrentStudy ( )
ViewManager GetViewManager ( )
return_value = GetViewManager ( )
SObject ImportTables ( in string theFileName )
return_value = ImportTables ( theFileName )
Result ImportFile ( in string theFileName )
return_value = ImportFile ( theFileName )
Result ImportMed ( in SObject theMedSObject )
return_value = ImportMed ( theMedSObject )
Result ImportMedField ( in FIELD theField )
return_value = ImportMedField ( theField )
Mesh MeshOnEntity ( in Result theResult, in string theMeshName, in Entity theEntity )
return_value = MeshOnEntity ( theResult, theMeshName, theEntity )
Mesh FamilyMeshOnEntity ( in Result theResult, in string theMeshName, in Entity theEntity, in string theFamilyName )
return_value = FamilyMeshOnEntity ( theResult, theMeshName, theEntity, theFamilyName )
Mesh GroupMesh ( in Result theResult, in string theMeshName, in string theGroupName )
return_value = GroupMesh ( theResult, theMeshName, theGroupName )
ScalarMap ScalarMapOnField ( in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration )
return_value = ScalarMapOnField ( theResult, theMeshName, theEntity, theFieldName, theIteration )
DeformedShape DeformedShapeOnField ( in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration )
return_value = DeformedShapeOnField ( theResult, theMeshName, theEntity, theFieldName, theIteration )
Vectors VectorsOnField ( in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration )
return_value = VectorsOnField ( theResult, theMeshName, theEntity, theFieldName, theIteration )
IsoSurfaces IsoSurfacesOnField ( in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration )
return_value = IsoSurfacesOnField ( theResult, theMeshName, theEntity, theFieldName, theIteration )
StreamLines StreamLinesOnField ( in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration )
return_value = StreamLinesOnField ( theResult, theMeshName, theEntity, theFieldName, theIteration )
CutPlanes CutPlanesOnField ( in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration )
return_value = CutPlanesOnField ( theResult, theMeshName, theEntity, theFieldName, theIteration )
CutLines CutLinesOnField ( in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration )
return_value = CutLinesOnField ( theResult, theMeshName, theEntity, theFieldName, theIteration )
Table CreateTable ( in string theTableEntry )
return_value = CreateTable ( theTableEntry )
Curve CreateCurve ( in Table theTable, in long theHRow, in long theVRow )
return_value = CreateCurve ( theTable, theHRow, theVRow )
Container CreateContainer ( )
return_value = CreateContainer ( )
Animation CreateAnimation ( in View3D theView3d )
return_value = CreateAnimation ( theView3d )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface View
IDL file
Python
void SetTitle ( in string theTitle )
SetTitle ( theTitle )
string GetTitle ( )
return_value = GetTitle ( )
void SetBackground ( in Color theColor )
SetBackground ( theColor )
Color GetBackground ( )
return_value = GetBackground ( )
void Minimize ( )
Minimize ( )
void Restore ( )
Restore ( )
void Maximize ( )
Maximize ( )
void EraseAll ( )
EraseAll ( )
void DisplayAll ( )
DisplayAll ( )
void Erase ( in PrsObject thePrsObj )
Erase ( thePrsObj )
void Display ( in PrsObject thePrsObj )
Display ( thePrsObj )
void DisplayOnly ( in PrsObject thePrsObj )
DisplayOnly ( thePrsObj )
void Update ( )
Update ( )
boolean SavePicture ( in string theFileName )
return_value = SavePicture ( theFileName )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface View3D
IDL file
Python
void FitAll ( )
FitAll ( )
void SetView ( in ViewType theType )
SetView ( theType )
void SetPointOfView ( in XYZ theCoord )
SetPointOfView ( theCoord )
XYZ GetPointOfView ( )
return_value = GetPointOfView ( )
void SetViewUp ( in XYZ theDir )
SetViewUp ( theDir )
XYZ GetViewUp ( )
return_value = GetViewUp ( )
void SetFocalPoint ( in XYZ theDir )
SetFocalPoint ( theDir )
XYZ GetFocalPoint ( )
return_value = GetFocalPoint ( )
void SetParallelScale ( in double theScale )
SetParallelScale ( theScale )
double GetParallelScale ( )
return_value = GetParallelScale ( )
void ScaleView ( in Axis theAxis, in double theParam )
ScaleView ( theAxis, theParam )
void RemoveScale ( )
RemoveScale ( )
boolean SaveViewParams ( in string theName )
return_value = SaveViewParams ( theName )
boolean RestoreViewParams ( in string theName )
return_value = RestoreViewParams ( theName )

- - - - - - - -
interface TableView
IDL file
Python

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface XYPlot
IDL file
Python
void SetSubTitle ( in string theTitle )
SetSubTitle ( theTitle )
string GetSubTitle ( )
return_value = GetSubTitle ( )
void SetCurveType ( in CurveType theType )
SetCurveType ( theType )
CurveType GetCurveType ( )
return_value = GetCurveType ( )
void SetMarkerSize ( in long theSize )
SetMarkerSize ( theSize )
long GetMarkerSize ( )
return_value = GetMarkerSize ( )
void EnableXGrid ( in boolean theMajor, in long theNumMajor, in boolean theMinor, in long theNumMinor )
EnableXGrid ( theMajor, theNumMajor, theMinor, theNumMinor )
void EnableYGrid ( in boolean theMajor, in long theNumMajor, in boolean theMinor, in long theNumMinor )
EnableYGrid ( theMajor, theNumMajor, theMinor, theNumMinor )
void SetHorScaling ( in Scaling theScaling )
SetHorScaling ( theScaling )
Scaling GetHorScaling ( )
return_value = GetHorScaling ( )
void SetVerScaling ( in Scaling theScaling )
SetVerScaling ( theScaling )
Scaling GetVerScaling ( )
return_value = GetVerScaling ( )
void SetXTitle ( in string theTitle )
SetXTitle ( theTitle )
string GetXTitle ( )
return_value = GetXTitle ( )
void SetYTitle ( in string theTitle )
SetYTitle ( theTitle )
string GetYTitle ( )
return_value = GetYTitle ( )
void ShowLegend ( in boolean theShowing )
ShowLegend ( theShowing )
void FitAll ( )
FitAll ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface ViewManager
IDL file
Python
View GetCurrentView ( )
return_value = GetCurrentView ( )
View3D Create3DView ( )
return_value = Create3DView ( )
TableView CreateTableView ( in Table theTable )
return_value = CreateTableView ( theTable )
XYPlot CreateXYPlot ( )
return_value = CreateXYPlot ( )
void Destroy ( in View theView )
Destroy ( theView )
void ProcessEvents ( )
ProcessEvents ( )

- diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile deleted file mode 100755 index 5b8f84d5..00000000 --- a/doc/html/INPUT/doxyfile +++ /dev/null @@ -1,200 +0,0 @@ -# Doxyfile 1.3-rc1 - -#--------------------------------------------------------------------------- -# General configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - VISU - v.2.0.0" -PROJECT_NUMBER = id#1.1 -OUTPUT_DIRECTORY = ../ -OUTPUT_LANGUAGE = English -EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = NO -ALWAYS_DETAILED_SEC = YES -INLINE_INHERITED_MEMB = YES -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -INTERNAL_DOCS = YES -CASE_SENSE_NAMES = YES -SHORT_NAMES = NO -HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES -SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 5 -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ALIASES = -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 25 -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = YES -SHOW_USED_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = log.txt -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = ../../../share/salome/idl/VISU_Gen.idl -FILE_PATTERNS = -RECURSIVE = NO -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = sources/ -INPUT_FILTER = -FILTER_SOURCE_FILES = YES -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = sources/myheader.html -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = YES -TOC_EXPAND = YES -DISABLE_INDEX = YES -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_SCHEMA = -XML_DTD = -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = NO -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = NO -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = NO -TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DOT_IMAGE_FORMAT = jpg -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1200 -GENERATE_LEGEND = NO -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO -CGI_NAME = search.cgi -CGI_URL = -DOC_URL = -DOC_ABSPATH = -BIN_ABSPATH = /usr/local/bin/ -EXT_DOC_PATHS = diff --git a/doc/html/INPUT/sources/Application-About.png b/doc/html/INPUT/sources/Application-About.png deleted file mode 100755 index 7b58330d..00000000 Binary files a/doc/html/INPUT/sources/Application-About.png and /dev/null differ diff --git a/doc/html/INPUT/sources/Application-About1.jpg b/doc/html/INPUT/sources/Application-About1.jpg deleted file mode 100755 index cf7ab8ba..00000000 Binary files a/doc/html/INPUT/sources/Application-About1.jpg and /dev/null differ diff --git a/doc/html/INPUT/sources/application.gif b/doc/html/INPUT/sources/application.gif deleted file mode 100644 index 0b05d5c1..00000000 Binary files a/doc/html/INPUT/sources/application.gif and /dev/null differ diff --git a/doc/html/INPUT/sources/application.jpg b/doc/html/INPUT/sources/application.jpg deleted file mode 100755 index a6979ab9..00000000 Binary files a/doc/html/INPUT/sources/application.jpg and /dev/null differ diff --git a/doc/html/INPUT/sources/bg_salome.gif b/doc/html/INPUT/sources/bg_salome.gif deleted file mode 100644 index c7e03068..00000000 Binary files a/doc/html/INPUT/sources/bg_salome.gif and /dev/null differ diff --git a/doc/html/INPUT/sources/logocorp.gif b/doc/html/INPUT/sources/logocorp.gif deleted file mode 100755 index 7697e083..00000000 Binary files a/doc/html/INPUT/sources/logocorp.gif and /dev/null differ diff --git a/doc/html/INPUT/sources/myheader.html b/doc/html/INPUT/sources/myheader.html deleted file mode 100755 index 83ca543c..00000000 --- a/doc/html/INPUT/sources/myheader.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - Main Page - - - -  -
- - - - - - -
-
-
- - - - diff --git a/doc/html/INPUT/sources/occ.gif b/doc/html/INPUT/sources/occ.gif deleted file mode 100755 index ce017c8a..00000000 Binary files a/doc/html/INPUT/sources/occ.gif and /dev/null differ diff --git a/doc/html/INPUT/sources/static/DataStruct.gif b/doc/html/INPUT/sources/static/DataStruct.gif deleted file mode 100755 index bec28ad2..00000000 Binary files a/doc/html/INPUT/sources/static/DataStruct.gif and /dev/null differ diff --git a/doc/html/INPUT/sources/static/PrsObj.gif b/doc/html/INPUT/sources/static/PrsObj.gif deleted file mode 100755 index a8aa81fe..00000000 Binary files a/doc/html/INPUT/sources/static/PrsObj.gif and /dev/null differ diff --git a/doc/html/INPUT/sources/static/View.gif b/doc/html/INPUT/sources/static/View.gif deleted file mode 100755 index b6aa909e..00000000 Binary files a/doc/html/INPUT/sources/static/View.gif and /dev/null differ diff --git a/doc/html/INPUT/sources/static/doxygen.css b/doc/html/INPUT/sources/static/doxygen.css deleted file mode 100755 index 0a8e93d5..00000000 --- a/doc/html/INPUT/sources/static/doxygen.css +++ /dev/null @@ -1,49 +0,0 @@ -H1 { text-align: center; } -CAPTION { font-weight: bold } -A.qindex {} -A.qindexRef {} -A.el { text-decoration: none; font-weight: bold } -A.elRef { font-weight: bold } -A.code { text-decoration: none; font-weight: normal; color: #4444ee } -A.codeRef { font-weight: normal; color: #4444ee } -A:hover { text-decoration: none; background-color: lightblue } -DL.el { margin-left: -1cm } -DIV.fragment { width: 100%; border: none; background-color: #CCCCCC } -DIV.ah { background-color: #CCCCCC; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px } -TD.md { background-color: lightblue; font-weight: bold; } -TD.mdname1 { background-color: lightblue; font-weight: bold; color: #602020; } -TD.mdname { background-color: lightblue; font-weight: bold; color: #602020; width: 600px; } -DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold } -DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller } -BODY { background: url(sources/bg_salome.gif) } -TD.indexkey { - background-color: #CCCCCC; - font-weight: bold; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - margin-top : 2px; - margin-bottom : 2px -} -TD.indexvalue { - background-color: #CCCCCC; - font-style: italic; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - margin-top : 2px; - margin-bottom : 2px -} -span.keyword { color: #008000 } -span.keywordtype { color: #604020 } -span.keywordflow { color: #e08000 } -span.comment { color: #800000 } -span.preprocessor { color: #806020 } -span.stringliteral { color: #002080 } -span.charliteral { color: #008080 } diff --git a/doc/html/INPUT/sources/static/examples_VISU.html b/doc/html/INPUT/sources/static/examples_VISU.html deleted file mode 100755 index 40e26ee9..00000000 --- a/doc/html/INPUT/sources/static/examples_VISU.html +++ /dev/null @@ -1,1270 +0,0 @@ - - - - - - - - Main Page - - - - -   -
- - - - - - - - -
- - -
-
- -

Examples

-      Interfaces:
-
- VISU::Base
- VISU::VISU_Gen
- VISU::PrsObject
-
- VISU::Result
-
- VISU::Prs3d
- VISU::Mesh
- VISU::ScalarMap
- VISU::CutPlanes
- VISU::CutLines
- VISU::IsoSurfaces
- VISU::DeformedShape
- VISU::Vectors
- VISU::StreamLines
-
- VISU::Table
- VISU::Curve
- VISU::Container
-
- VISU::ViewManager
- VISU::View
- VISU::View3D
- VISU::TableView
- VISU::XYPlot
- -

Base

- - - - - - - - - - - - -
IdType - VISU::Base::GetID (   - ) 
-
- -

#Returns ID of the object. That is IOR of CORBA representation a VISU -object.
-

- -

aSObject = myLocalStudy.FindObjectIOR(theResult.GetID())
-

- - - - - - - - - - - -
VISUType - VISU::Base::GetType (   - ) 
- -

#Returns the type of the presentable object. It can be used for quick -class definition of an VISU object
-
- if aVISUObject.GetType() == VISU.TSCALARMAP :
-     #do something ...
-

- -


-

-

VISU_Gen
-

- - - - - - - - - - - - - -
void VISU::VISU_Gen::SetCurrentStudy - ( in SALOMEDS::Study   theStudy - ) 
-
-
- -

- - - - - - - -
- - - - - - - - - - - -
SALOMEDS::Study -VISU::VISU_Gen::GetCurrentStudy (   - ) 
-
-
-
- #It is very important to set SALOMEDS::Study for VISU Engine before you -start any work with them.
- #Every object that you will create will be assigned to the study you set -before.
- #It can be done like this:
-

- -

aStudy = myStudyManager.NewStudy("A foo Study")
- if aStudy is None : raise RuntimeError, "Error"
- else : print "OK"
-     theVisuGen.SetCurrentStudy(aStudy)
-     #to do every things you like
-     ...
-

- -

- - - - - - - -
- - - - - - - - - - - -
ViewManager -VISU::VISU_Gen::GetViewManager (   - ) 
-
-
- - - - - - - - - -
  -

Gets the ViewManager which is used for creation of post-processing -presentations.

-
-
- #In order to display any VISU::PrsObject in propriate viewer you must take -VISU::ViewManager interface
-

- -

aViewManager = myVisuGen.GetViewManager()
- #to do something for displaing some presentation
- ...
-

- -

- - - - - - - -
- - - - - - - - - - - - -
SALOMEDS::SObject -VISU::VISU_Gen::ImportTables ( in string   theFileName - ) 
-
-
- - - - - - - - - -
  -

Imports tables from a file and create TableAttribute in Sudy -

-
-
- #It is possible to import some ASCII files that include text table representation. -One file can consist from more than one table.
-

- -

aSObject = myVisuGen.ImportTables("/MyPresicousFileOfTables.txt")
-

- -

- - - - - - - -
- - - - - - - - - - - - -
Result -VISU::VISU_Gen::ImportFile ( in string   theFileName - ) 
-
-
- - - - - - - - - -
  -

Imports data from a file.

-
-
- #It is possible import a med files to VISU
-

- -

aResult = myVisuGen.ImportFile("/ItIsDreamOfMyLife.med")
-

- -

- - - - - - - -
- - - - - - - - - - - - -
Result -VISU::VISU_Gen::ImportMed ( in SALOMEDS::SObject   theMedSObject - ) 
-
-
- - - - - - - - - -
  -

Imports data from a MED object.

-
-
- #
-

- -

- - - - - - - -
- - - - - - - - - - - - -
Result -VISU::VISU_Gen::ImportMedField ( in SALOME_MED::FIELD   theField - ) 
-
-
- - - - - - - - - -
  -

Imports data from a MED field.

-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Mesh -VISU::VISU_Gen::MeshOnEntity ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in Entity   theEntity

- 		) 
-
-
- - - - - - - - - -
  -

Creates a Mesh on the basis of the data generated in other sources -(MED object or file).

-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Mesh -VISU::VISU_Gen::FamilyMeshOnEntity ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in Entity   theEntity, -

-
- 		in string   theFamilyName

- 		) 
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Mesh -VISU::VISU_Gen::GroupMesh ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in string   theGroupName

- 		) 
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ScalarMap -VISU::VISU_Gen::ScalarMapOnField ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in Entity   theEntity, -

-
- 		in string   theFieldName, -

-
- 		in double   theIteration

- 		) 
-
-
- - - - - - - - - -
  -

Creates a scalar bar presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DeformedShape -VISU::VISU_Gen::DeformedShapeOnField ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in Entity   theEntity, -

-
- 		in string   theFieldName, -

-
- 		in double   theIteration

- 		) 
-
-
- - - - - - - - - -
  -

Creates a deformed shape presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Vectors -VISU::VISU_Gen::VectorsOnField ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in Entity   theEntity, -

-
- 		in string   theFieldName, -

-
- 		in double   theIteration

- 		) 
-
-
- - - - - - - - - -
  -

Creates a vector presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IsoSurfaces -VISU::VISU_Gen::IsoSurfacesOnField ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in Entity   theEntity, -

-
- 		in string   theFieldName, -

-
- 		in double   theIteration

- 		) 
-
-
- - - - - - - - - -
  -

Creates an iso surface presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StreamLines -VISU::VISU_Gen::StreamLinesOnField ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in Entity   theEntity, -

-
- 		in string   theFieldName, -

-
- 		in double   theIteration

- 		) 
-
-
- - - - - - - - - -
  -

Creates an stream lines presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CutPlanes -VISU::VISU_Gen::CutPlanesOnField ( in Result   theResult, -

-
- 		in string   theMeshName, -

-
- 		in Entity   theEntity, -

-
- 		in string   theFieldName, -

-
- 		in double   theIteration

- 		) 
-
-
- - - - - -
  -

Creates a presentation of cut planes.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/doc/html/INPUT/sources/static/overview_VISU.html b/doc/html/INPUT/sources/static/overview_VISU.html deleted file mode 100755 index 844abd40..00000000 --- a/doc/html/INPUT/sources/static/overview_VISU.html +++ /dev/null @@ -1,252 +0,0 @@ - - - - - - Main Page - - - -  -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName 
- - - - - - -
-
-
- - -

General overview -

-

Table of contents

- - -
-

1. Introduction

-

Post-processing module VISU for SALOME is destined for visualization of data - produced by other components. VISU provides various forms of data visualization - including:

- -
    -
  • Data tables,
    • -
  • XY plots based on data from tables,
    • -
  • 3D presentations,
    • -
      -
    • Scalar Map,
      • -
    • Deformed Shape,
      • -
    • Vectors,
      • -
    • Iso Surfaces,
      • -
    • Cut Planes,
      • -
    • Stream Lines,
      • -
    • Cut Lines.
      • -
    -
-Back to the contents -

2. Defintions

-

The following terms are used for presentation of the VISU module:

-
-
Study
-
manages data produced by various component of SALOME platform. More detailed description of the SALOME Study can be found in the document named "Data Structure and Persistence Specifications".
-
Component
-
a SALOME software module that implements predefined interfaces. -The component provides the data for the SALOME study in a form of links (stored in the Study) -to the specific data stored in the component. All components are CORBA servers and it allows them -to be running on different host stations.
-
Geometry
a coherent set of data produced by component GEOM or any other geometry tool -and imported using geometry exchange interface (like BRep, IGES and so on).
-
Mesh
a collection of elements used as a support for numeric simulation.
-
Field
the set of results of the same type allocated to mesh elements. -Fields can be one of next types: scalars, vectors, tensors, matrices, character strings.
-
-Back to the contents -

3. Forms of data visualization

-

3.1 Data tables

-

Table represents data in spreadsheet-like form. For these purposes the QTable - widget will be provided. This widget can be reused in any module for any dialog - box as a control. For post-processing data visualization needs this widget is - used inside of Table window (based on non-modal window frame). Data represented - in Table window of post-processing module is be editable.

-

3.2 XY plots

-

XY plot represents calculation data in form of 2D (XY) plotting. -XY plot view is shown in a separated view window (non-modal dialog box), which can be moved in any position of the screen for convenience. -The QWT extension of QT toolkit is used for XY plotting. -QWT provides unlimited number of displayed curves (data sets) and supports logarithmic scale, zooming, and selection.

- -

3.3 3D presentations

-

A 3D presentation shows geometry, mesh and fields in 3D space. -Provides selection, rotation, zooming, scaling, and panning of 3d scene. -Color bar for scalar data presentation is supplied. -For 3D presentation window of the current implementation of VTK viewer in study window is used.

-Back to the contents -

4. Data structure

-

Source data for post-processing module can be imported from MED file or MED object in study data structure (CORBA object) can be used for this purposes.

-

In case of import MED file the data from this file will be converted in form of VTK Data Source format and stored in VISU data structure. In case of using of MED object from study the label in VISU data structure will be created with reference to the corresponded MED object.

-

Available result data is displayed under corresponded MED data label. For every result the number of presentations can be created dependently on result type.

-

Presentation is represented in data structure in form of list of presentation creation parameters. This could be:

-
    -
  • Presentation type (table, XY plot, 3d view);
    • -
  • Presentation subtype (for example for 3d: scalar map, iso-surfaces, combined view and so on);
    • -
  • Parameters of the presentation dependently on its type (number of colors, type of scale, font parameters, grid parameters and so on).
    • -
-

Parameters of presentation are persistent data, which will be stored in study file.

- - -
-Back to the contents -

5. VISU module features and services

-

The functionality of the VISU module is provided by a set of classes which are combined into -the VISU package. -

The API reference of the VISU component can be found here.

-

5.1 Base class

-

This is a root class for all objects of the VISU module.

-

The API reference for this class can be found here.

- -

5.2 ViewManager class

-

This class is used for management of the view windows (creation and deletion).

-

The API reference for this class can be found here.

- -

5.3 View class

-

View class is a base for all other classes, necessary for creation of different views .

- -
-

The API reference for this class can be found here.

- -

5.3.1 3dView class

-

This class provides a set of methods for creation of a 3d view window.

-

The API reference for this class can be found here.

- -

5.3.2 TableView class

-

This class provides a set of methods for creation of a Table view window.

-

The API reference for this class can be found here.

- -

5.3.3 XYPlotView class

-

This class provides a set of methods for creation of a XYPlot view window.

-

The API reference for this class can be found here.

- -

5.4 Result class

-

This class serves for inner representation of data generated in other sources. -(MED object or file) This data is needed for further construction of graphical presentations.

-

The API reference for this class can be found here.

-

5.5 PrsObject class

-

It is the root class of all presentable objects.

-
-

The API reference for this class can be found here.

- -

5.5.1 Curve class

-

Manages presentation parameters of one curve. -This object can be used for presentation of set of curves using Container class.

-

The API reference for this class can be found here.

- -

5.5.2 Table class

-

Manages presentation parameters of a table.

-

The API reference for this class can be found here.

- -

5.5.3 Container class

-

This class is provided in order to create one presentation using several presentable objects. This can provide combination of a set of curves to display them in XY plot view. -

-

The API reference for this class can be found here.

- -

5.5.4 Prs3d class

-

Root class for all 3D presentations.

-

The API reference for this class can be found here.

- -

5.5.5 Mesh class

-

Manages presentation parameters of a 3D presentattion of a mesh. -This object can be used for presentation of set of curves using Container class.

-

The API reference for this class can be found here.

- -

5.5.6 ScalarMap class

-

Manages presentation parameters of the scalar bar.

-

The API reference for this class can be found here.

- -

5.5.7 CutLines class

-

Manages presentation parameters of the cut lines presentation.

-

The API reference for this class can be found here.

- -

5.5.8 CutPlanes class

-

Manages presentation parameters of the cut planes presentation.

-

The API reference for this class can be found here.

- -

5.5.9 IsoSurfaces class

-

Manages presentation parameters of the iso surfaces presentation.

-

The API reference for this class can be found here.

- -

5.5.10 DeformedShape class

-

Manages presentation parameters of the deformed shape presentation.

-

The API reference for this class can be found here.

- -

5.5.11 Vectors class

-

Manages presentation parameters of the vector presentation.

-

The API reference for this class can be found here.

- -

5.5.12 StreamLines class

-

Manages presentation parameters of the streamlines presentation.

-

The API reference for this class can be found here.

- -

5.6 Animation class

-

This class provides a set of methods used for:

-
    -
  • generating different animations,
    • -
  • setting the parameters of the animations,
    • -
  • playing these animations in the VISU module.
    • -
-

The API reference for this class can be found here.

- -

5.7 VISU_Gen class

-

This is the main clas of the VISU component in SALOME application. It is used for , -using the views provided by ViewManager. This class provides a set of methods used for:

-
    -
  • creation of all types of post-processing presentations from given Result and Table object reference
    • -
  • creation of animations
    • - -
-

The API reference for this class can be found here.

-Back to the contents - - diff --git a/doc/html/INPUT/sources/static/page2.html b/doc/html/INPUT/sources/static/page2.html deleted file mode 100755 index d31cf0c4..00000000 --- a/doc/html/INPUT/sources/static/page2.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Main Page - - - -  -
- - - - - - -
-
-
- - - - - - - - diff --git a/doc/html/INPUT/sources/static/tree.js b/doc/html/INPUT/sources/static/tree.js deleted file mode 100755 index 264bfe2d..00000000 --- a/doc/html/INPUT/sources/static/tree.js +++ /dev/null @@ -1,85 +0,0 @@ -foldersTree = gFld("SALOME v.2.0.0 ", "", "") - insDoc(foldersTree, gLnk("Main Page", "", "main.html")) - -aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) - aux2 = insFld(aux1, gFld("Modules", "")) - aux3 = insFld(aux2, gFld("SALOME VISU module", "")) - insDoc(aux3, gLnk("Overview", "", "overview_VISU.html")) - aux4 = insFld(aux3, gFld("Packages", "")) - insDoc(aux4, gLnk("VISU", "", "namespaceVISU.html")) - insDoc(aux3, gLnk("Examples", "", "examples_VISU.html")) - - -/*! Data structures -*/ - insDoc(aux1, gLnk("Data Structures", "", "annotated.html")) - -/*! insDoc(aux1, gLnk("VISU::Animation", "", "interfaceVISU_1_1Animation.html")) - insDoc(aux1, gLnk("VISU::Base", "", "interfaceVISU_1_1Base.html")) - insDoc(aux1, gLnk("VISU::Container", "", "interfaceVISU_1_1Container.html")) - insDoc(aux1, gLnk("VISU::Curve", "", "interfaceVISU_1_1Curve.html")) - insDoc(aux1, gLnk("VISU::CutLines", "", "interfaceVISU_1_1CutLines.html")) - insDoc(aux1, gLnk("VISU::CutPlanes", "", "interfaceVISU_1_1CutPlanes.html")) - insDoc(aux1, gLnk("VISU::DeformedShape", "", "interfaceVISU_1_1DeformedShape.html")) - insDoc(aux1, gLnk("VISU::IsoSurfaces", "", "interfaceVISU_1_1IsoSurfaces.html")) - insDoc(aux1, gLnk("VISU::Mesh", "", "interfaceVISU_1_1Mesh.html")) - insDoc(aux1, gLnk("VISU::Prs3d", "", "interfaceVISU_1_1Prs3d.html")) - insDoc(aux1, gLnk("VISU::PrsObject", "", "interfaceVISU_1_1PrsObject.html")) - insDoc(aux1, gLnk("VISU::Result", "", "interfaceVISU_1_1Result.html")) - insDoc(aux1, gLnk("VISU::ScalarMap", "", "interfaceVISU_1_1ScalarMap.html")) - insDoc(aux1, gLnk("VISU::StreamLines", "", "interfaceVISU_1_1StreamLines.html")) - insDoc(aux1, gLnk("VISU::Table", "", "interfaceVISU_1_1Table.html")) - insDoc(aux1, gLnk("VISU::TableView", "", "interfaceVISU_1_1TableView.html")) - insDoc(aux1, gLnk("VISU::Vectors", "", "interfaceVISU_1_1Vectors.html")) - insDoc(aux1, gLnk("VISU::View", "", "interfaceVISU_1_1View.html")) - insDoc(aux1, gLnk("VISU::View3D", "", "interfaceVISU_1_1View3D.html")) - insDoc(aux1, gLnk("VISU::ViewManager", "", "interfaceVISU_1_1ViewManager.html")) - insDoc(aux1, gLnk("VISU::VISU_Gen", "", "interfaceVISU_1_1VISU__Gen.html")) - insDoc(aux1, gLnk("VISU::XYPlot", "", "interfaceVISU_1_1XYPlot.html")) -*/ - insDoc(aux1, gLnk("Class Hierarchy", "", "hierarchy.html")) - -/*! - aux2 = insFld(aux1, gFld("VISU::Base", "", "interfaceVISU_1_1Base.html")) - insDoc(aux2, gLnk("VISU::Animation", "", "interfaceVISU_1_1Animation.html")) - aux3 = insFld(aux2, gFld("VISU::PrsObject", "", "interfaceVISU_1_1PrsObject.html")) - insDoc(aux3, gLnk("VISU::Container", "", "interfaceVISU_1_1Container.html")) - insDoc(aux3, gLnk("VISU::Curve", "", "interfaceVISU_1_1Curve.html")) - aux4 = insFld(aux3, gFld("VISU::Prs3d", "", "interfaceVISU_1_1Prs3d.html")) - insDoc(aux4, gLnk("VISU::Mesh", "", "interfaceVISU_1_1Mesh.html")) - aux5 = insFld(aux4, gFld("VISU::ScalarMap", "", "interfaceVISU_1_1ScalarMap.html")) - insDoc(aux5, gLnk("VISU::CutLines", "", "interfaceVISU_1_1CutLines.html")) - insDoc(aux5, gLnk("VISU::CutPlanes", "", "interfaceVISU_1_1CutPlanes.html")) - aux6 = insFld(aux5, gFld("VISU::DeformedShape", "", "interfaceVISU_1_1DeformedShape.html")) - insDoc(aux6, gLnk("VISU::StreamLines", "", "interfaceVISU_1_1StreamLines.html")) - insDoc(aux6, gLnk("VISU::Vectors", "", "interfaceVISU_1_1Vectors.html")) - insDoc(aux5, gLnk("VISU::IsoSurfaces", "", "interfaceVISU_1_1IsoSurfaces.html")) - insDoc(aux3, gLnk("VISU::Table", "", "interfaceVISU_1_1Table.html")) - insDoc(aux2, gLnk("VISU::Result", "", "interfaceVISU_1_1Result.html")) - aux3 = insFld(aux2, gFld("VISU::View", "", "interfaceVISU_1_1View.html")) - insDoc(aux3, gLnk("VISU::TableView", "", "interfaceVISU_1_1TableView.html")) - insDoc(aux3, gLnk("VISU::View3D", "", "interfaceVISU_1_1View3D.html")) - insDoc(aux3, gLnk("VISU::XYPlot", "", "interfaceVISU_1_1XYPlot.html")) - insDoc(aux2, gLnk("VISU::ViewManager", "", "interfaceVISU_1_1ViewManager.html")) - insDoc(aux2, gLnk("VISU::VISU_Gen", "", "interfaceVISU_1_1VISU__Gen.html")) - insDoc(aux2, gLnk("VISU::VISU_Gen", "", "interfaceVISU_1_1VISU__Gen.html")) - insDoc(aux2, gLnk("VISU::VISU_Gen", "", "interfaceVISU_1_1VISU__Gen.html")) -*/ - insDoc(aux1, gLnk("Class methods list", "", "functions.html")) -/*! -aux1 = insFld(foldersTree, gFld("Namespace List", "", "namespaces.html")) - insDoc(aux1, gLnk("VISU", "", "namespaceVISU.html")) -*/ - insDoc(aux1, gLnk("Namespace Members", "", "namespacemembers.html")) - - insDoc(aux1, gLnk("File List", "", "files.html")) - -/*! - insDoc(aux1, gLnk("VISU_Gen.idl", "", "VISU__Gen_8idl.html")) -*/ - -aux1 = insFld(foldersTree, gFld("IDL/Python mapping", "")) - insDoc(aux1, gLnk("Mapping of VISU IDL definitions to Python language", "", "page2.html")) - -/*! insDoc(foldersTree, gLnk("Graphical Class Hierarchy", "", "inherits.html")) -*/ diff --git a/doc/html/INPUT/sources/static/treeview.js b/doc/html/INPUT/sources/static/treeview.js deleted file mode 100644 index 55eb43d0..00000000 --- a/doc/html/INPUT/sources/static/treeview.js +++ /dev/null @@ -1,505 +0,0 @@ -//**************************************************************** -// You are free to copy the "Folder-Tree" script as long as you -// keep this copyright notice: -// Script found in: http://www.geocities.com/Paris/LeftBank/2178/ -// Author: Marcelino Alves Martins (martins@hks.com) December '97. -//**************************************************************** - -//Log of changes: -// 17 Feb 98 - Fix initialization flashing problem with Netscape -// -// 27 Jan 98 - Root folder starts open; support for USETEXTLINKS; -// make the ftien4 a js file -// -// DvH: Dec 2000 - Made some minor changes to support external -// references - -// Definition of class Folder -// ***************************************************************** - -function Folder(folderDescription, tagName, hreference) //constructor -{ - //constant data - this.desc = folderDescription - this.tagName = tagName - this.hreference = hreference - this.id = -1 - this.navObj = 0 - this.iconImg = 0 - this.nodeImg = 0 - this.isLastNode = 0 - - //dynamic data - this.isOpen = true - this.iconSrc = "ftv2folderopen.png" - this.children = new Array - this.nChildren = 0 - - //methods - this.initialize = initializeFolder - this.setState = setStateFolder - this.addChild = addChild - this.createIndex = createEntryIndex - this.hide = hideFolder - this.display = display - this.renderOb = drawFolder - this.totalHeight = totalHeight - this.subEntries = folderSubEntries - this.outputLink = outputFolderLink -} - -function setStateFolder(isOpen) -{ - var subEntries - var totalHeight - var fIt = 0 - var i=0 - - if (isOpen == this.isOpen) - return - - if (browserVersion == 2) - { - totalHeight = 0 - for (i=0; i < this.nChildren; i++) - totalHeight = totalHeight + this.children[i].navObj.clip.height - subEntries = this.subEntries() - if (this.isOpen) - totalHeight = 0 - totalHeight - for (fIt = this.id + subEntries + 1; fIt < nEntries; fIt++) - indexOfEntries[fIt].navObj.moveBy(0, totalHeight) - } - this.isOpen = isOpen - propagateChangesInState(this) -} - -function propagateChangesInState(folder) -{ - var i=0 - - if (folder.isOpen) - { - if (folder.nodeImg) - if (folder.isLastNode) - folder.nodeImg.src = "ftv2mlastnode.png" - else - folder.nodeImg.src = "ftv2mnode.png" - folder.iconImg.src = "ftv2folderopen.png" - for (i=0; i 0) - auxEv = "" - else - auxEv = "" - - if (level>0) - if (lastNode) //the last 'brother' in the children array - { - this.renderOb(leftSide + auxEv + "") -// leftSide = leftSide + "" - this.isLastNode = 1 - } - else - { - this.renderOb(leftSide + auxEv + "") - leftSide = leftSide + "" - this.isLastNode = 0 - } - else - this.renderOb("") - - if (nc > 0) - { - level = level + 1 - for (i=0 ; i < this.nChildren; i++) - { - if (i == this.nChildren-1) - this.children[i].initialize(level, 1, leftSide) - else - this.children[i].initialize(level, 0, leftSide) - } - } -} - -function drawFolder(leftSide) -{ - if (browserVersion == 2) { - if (!doc.yPos) - doc.yPos=8 - doc.write("") - } - if (browserVersion == 3) - { - doc.write("
") - } - - doc.write("\n") - doc.write("\n\n") - doc.write("\n
") - doc.write(leftSide) - this.outputLink() - doc.write("") - doc.write("") - if (USETEXTLINKS) - { - this.outputLink() - doc.write(this.desc + "") - } - else - doc.write(this.desc) - -/*! - if (this.tagName!="") - { - doc.write(" [external]") - } -*/ - doc.write("
\n") - - if (browserVersion == 2) { - doc.write("") - } - if (browserVersion == 3) { - doc.write("
") - } - - if (browserVersion == 1) { - this.navObj = doc.all["folder"+this.id] - this.iconImg = doc.all["folderIcon"+this.id] - this.nodeImg = doc.all["nodeIcon"+this.id] - } else if (browserVersion == 2) { - this.navObj = doc.layers["folder"+this.id] - this.iconImg = this.navObj.document.images["folderIcon"+this.id] - this.nodeImg = this.navObj.document.images["nodeIcon"+this.id] - doc.yPos=doc.yPos+this.navObj.clip.height - } else if (browserVersion == 3) { - this.navObj = doc.getElementById("folder"+this.id) - this.iconImg = doc.images.namedItem("folderIcon"+this.id) - this.nodeImg = doc.images.namedItem("nodeIcon"+this.id) - } -} - -function outputFolderLink() -{ - if (this.hreference) - { - doc.write(" 0) - doc.write("onClick='javascript:clickOnFolder("+this.id+")'") - doc.write(">") - } - else - doc.write("") -} - -function addChild(childNode) -{ - this.children[this.nChildren] = childNode - this.nChildren++ - return childNode -} - -function folderSubEntries() -{ - var i = 0 - var se = this.nChildren - - for (i=0; i < this.nChildren; i++){ - if (this.children[i].children) //is a folder - se = se + this.children[i].subEntries() - } - - return se -} - - -// Definition of class Item (a document or link inside a Folder) -// ************************************************************* - -function Item(itemDescription, tagName, itemLink) // Constructor -{ - // constant data - this.desc = itemDescription - this.tagName = tagName - this.link = itemLink - this.id = -1 //initialized in initalize() - this.navObj = 0 //initialized in render() - this.iconImg = 0 //initialized in render() - this.iconSrc = "ftv2doc.png" - - // methods - this.initialize = initializeItem - this.createIndex = createEntryIndex - this.hide = hideItem - this.display = display - this.renderOb = drawItem - this.totalHeight = totalHeight -} - -function hideItem() -{ - if (browserVersion == 1 || browserVersion == 3) { - if (this.navObj.style.display == "none") - return - this.navObj.style.display = "none" - } else { - if (this.navObj.visibility == "hidden") - return - this.navObj.visibility = "hidden" - } -} - -function initializeItem(level, lastNode, leftSide) -{ - this.createIndex() - - if (level>0) - if (lastNode) //the last 'brother' in the children array - { - this.renderOb(leftSide + "") - leftSide = leftSide + "" - } - else - { - this.renderOb(leftSide + "") - leftSide = leftSide + "" - } - else - this.renderOb("") -} - -function drawItem(leftSide) -{ - if (browserVersion == 2) - doc.write("") - if (browserVersion == 3) - doc.write("
") - - doc.write("\n\n") - doc.write("\n
") - doc.write(leftSide) - if (this.link!="") - { - doc.write("") - } - doc.write("") - if (this.link!="") - { - doc.write("") - } - doc.write("") - if (USETEXTLINKS && this.link!="") - doc.write("" + this.desc + "") - else - doc.write(this.desc) -/*! - if (this.tagName!="") - { - doc.write(" [external]"); - } -*/ - doc.write("\n
\n") - - if (browserVersion == 2) - doc.write("") - if (browserVersion == 3) - doc.write("
") - - if (browserVersion == 1) { - this.navObj = doc.all["item"+this.id] - this.iconImg = doc.all["itemIcon"+this.id] - } else if (browserVersion == 2) { - this.navObj = doc.layers["item"+this.id] - this.iconImg = this.navObj.document.images["itemIcon"+this.id] - doc.yPos=doc.yPos+this.navObj.clip.height - } else if (browserVersion == 3) { - this.navObj = doc.getElementById("item"+this.id) - this.iconImg = doc.images.namedItem("itemIcon"+this.id) - } -} - - -// Methods common to both objects (pseudo-inheritance) -// ******************************************************** - -function display() -{ - if (browserVersion == 1 || browserVersion == 3) - this.navObj.style.display = "block" - else - this.navObj.visibility = "show" -} - -function createEntryIndex() -{ - this.id = nEntries - indexOfEntries[nEntries] = this - nEntries++ -} - -// total height of subEntries open -function totalHeight() //used with browserVersion == 2 -{ - var h = this.navObj.clip.height - var i = 0 - - if (this.isOpen) //is a folder and _is_ open - for (i=0 ; i < this.nChildren; i++) - h = h + this.children[i].totalHeight() - - return h -} - - -// Events -// ********************************************************* - -function clickOnFolder(folderId) -{ - var clicked = indexOfEntries[folderId] - - if (!clicked.isOpen) - clickOnNode(folderId) - - return - - if (clicked.isSelected) - return -} - -function clickOnNode(folderId) -{ - var clickedFolder = 0 - var state = 0 - - clickedFolder = indexOfEntries[folderId] - state = clickedFolder.isOpen - - clickedFolder.setState(!state) //open<->close -} - -function initializeDocument() -{ - doc = document; - if (doc.all) - browserVersion = 1 //IE4 - else - if (doc.layers) - browserVersion = 2 //NS4 - else if(navigator.userAgent.toLowerCase().indexOf('gecko') != -1) - browserVersion = 3 //mozilla - else - browserVersion = 0 //other - - foldersTree.initialize(0, 1, "") - foldersTree.display() - - if (browserVersion > 0) - { - if(browserVersion != 3) - doc.write(" ") - - // close the whole tree - clickOnNode(0) - // open the root folder - clickOnNode(0) - } -} - -// Auxiliary Functions for Folder-Treee backward compatibility -// ********************************************************* - -function gFld(description, tagName, hreference) -{ - folder = new Folder(description, tagName, hreference) - return folder -} - -function gLnk(description, tagName, linkData) -{ - fullLink = "" - - if (linkData!="") - { - fullLink = "'"+linkData+"' target=\"basefrm\"" - } - - linkItem = new Item(description, tagName, fullLink) - return linkItem -} - -function insFld(parentFolder, childFolder) -{ - return parentFolder.addChild(childFolder) -} - -function insDoc(parentFolder, document) -{ - parentFolder.addChild(document) -} - -// Global variables -// **************** - -USETEXTLINKS = 1 -indexOfEntries = new Array -nEntries = 0 -doc = document -browserVersion = 0 -selectedFolder=0 diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in deleted file mode 100644 index 9c524858..00000000 --- a/doc/html/Makefile.in +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (C) 2003 CEA/DEN, EDF R&D -# -# -# -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Module : doc -# $Header: - -top_srcdir=@top_srcdir@ -root_srcdir=@ROOT_SRCDIR@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ - -@COMMENCE@ - -doc: - cp -fr $(srcdir)/INPUT ./; \ - cd INPUT; \ - sed 's|../../../share/salome|$(root_srcdir)|' doxyfile > doxyfile1; \ - mv -f doxyfile1 doxyfile; \ - $(doxygen) ./doxyfile; \ - cd ..; \ - cp -fr $(srcdir)/INPUT/sources/static/*.* ./html/ - cp -fr $(srcdir)/INPUT/sources/ html/ - cp -fr $(srcdir)/INPUT/HTML/ html/ - -clean: - rm -rf html - -distclean: clean - rm -rf INPUT - -install: - $(INSTALL) -d $(docdir); \ - cp -rf html $(docdir) - -uninstall: - rm -rf $(docdir)/html diff --git a/src/CONVERTOR/VISU_Convertor.hxx b/src/CONVERTOR/VISU_Convertor.hxx index 92a45a32..5338d17a 100644 --- a/src/CONVERTOR/VISU_Convertor.hxx +++ b/src/CONVERTOR/VISU_Convertor.hxx @@ -159,6 +159,8 @@ namespace VISU{ typedef float TCoord; typedef std::vector TPointsCoord; TPointsCoord myPointsCoord; + typedef std::vector TPointsDim; + TPointsDim myPointsDim; TMeshOnEntityMap myMeshOnEntityMap; TGroupMap myGroupMap; TMesh() : myDim(0), myNbPoints(0) {} diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx index bbcbf60e..1b8e88ac 100644 --- a/src/CONVERTOR/VISU_Convertor_impl.cxx +++ b/src/CONVERTOR/VISU_Convertor_impl.cxx @@ -71,33 +71,141 @@ void VISU::WriteToFile(vtkUnstructuredGrid* theDataSet, const string& theFileNam //aWriter->Delete(); } +enum ECoordName{eX, eY, eZ, eNone}; +typedef VISU::TMesh::TCoord (*TGetCoord)(const VISU::TMesh::TPointsCoord&, int); + +template +VISU::TMesh::TCoord GetCoord(const VISU::TMesh::TPointsCoord& thePointsCoord, + int theStartPos) +{ + return thePointsCoord[theStartPos+TheCoordId]; +} + +template<> +VISU::TMesh::TCoord GetCoord(const VISU::TMesh::TPointsCoord& thePointsCoord, + int theStartPos) +{ + return 0.0; +} + + +static TGetCoord aXYZGetCoord[3] = { + &GetCoord, + &GetCoord, + &GetCoord +}; + + +static TGetCoord aXYGetCoord[3] = { + &GetCoord, + &GetCoord, + &GetCoord +}; + +static TGetCoord aYZGetCoord[3] = { + &GetCoord, + &GetCoord, + &GetCoord +}; + +static TGetCoord aXZGetCoord[3] = { + &GetCoord, + &GetCoord, + &GetCoord +}; + + +static TGetCoord aXGetCoord[3] = { + &GetCoord, + &GetCoord, + &GetCoord +}; + +static TGetCoord aYGetCoord[3] = { + &GetCoord, + &GetCoord, + &GetCoord +}; + +static TGetCoord aZGetCoord[3] = { + &GetCoord, + &GetCoord, + &GetCoord +}; + + +class TCoordHelper{ + const VISU::TMesh::TPointsCoord& myPointsCoord; + TGetCoord* myGetCoord; +public: + TCoordHelper(const VISU::TMesh::TPointsCoord& thePointsCoord, + TGetCoord* theGetCoord): + myPointsCoord(thePointsCoord), + myGetCoord(theGetCoord) + {} + virtual ~TCoordHelper(){} + VISU::TMesh::TCoord GetCoord(int theStartPos, int theCoodId){ + return (*myGetCoord[theCoodId])(myPointsCoord,theStartPos); + } +}; +typedef std::auto_ptr TCoordHelperPtr; + + namespace{ void GetPoints(VISU::TVTKSource& theStorage, VISU::TMesh& theMesh) { vtkPoints* aPoints = theMesh.myPoints.GetPointer(); if(!aPoints){ aPoints = vtkPoints::New(); - if(MYVTKDEBUG) aPoints->DebugOn(); + TCoordHelperPtr aCoordHelperPtr; const VISU::TMesh::TPointsCoord& anArray = theMesh.myPointsCoord; + { + int aMeshDimension = theMesh.myDim; + bool anIsDimPresent[3] = {false, false, false}; + for(int iDim = 0; iDim < aMeshDimension; iDim++){ + string aDimName = theMesh.myPointsDim[iDim]; + if(aDimName == "x" || aDimName == "X") + anIsDimPresent[eX] = true; + else if(aDimName == "y" || aDimName == "Y") + anIsDimPresent[eY] = true; + else if(aDimName == "z" || aDimName == "Z") + anIsDimPresent[eZ] = true; + } + + switch(aMeshDimension){ + case 3: + aCoordHelperPtr.reset(new TCoordHelper(anArray,aXYZGetCoord)); + break; + case 2: + if(anIsDimPresent[eY] && anIsDimPresent[eZ]) + aCoordHelperPtr.reset(new TCoordHelper(anArray,aYZGetCoord)); + else if(anIsDimPresent[eX] && anIsDimPresent[eZ]) + aCoordHelperPtr.reset(new TCoordHelper(anArray,aXZGetCoord)); + else + aCoordHelperPtr.reset(new TCoordHelper(anArray,aXYGetCoord)); + break; + case 1: + if(anIsDimPresent[eY]) + aCoordHelperPtr.reset(new TCoordHelper(anArray,aYGetCoord)); + else if(anIsDimPresent[eZ]) + aCoordHelperPtr.reset(new TCoordHelper(anArray,aZGetCoord)); + else + aCoordHelperPtr.reset(new TCoordHelper(anArray,aXGetCoord)); + break; + } + } + + if(MYVTKDEBUG) aPoints->DebugOn(); vtkIdType iEnd = theMesh.myPointsCoord.size(); vtkIdType aNbPoints = iEnd / theMesh.myDim; aPoints->SetNumberOfPoints(aNbPoints); if(MYDEBUG) MESSAGE("GetPoints - aNbPoints = "<> MEDnoeudsLire(...)")); if(!isPointsLoaded){ + + VISU::TMesh::TPointsDim& aPointsDim = theMesh.myPointsDim; + aPointsDim.resize(theMesh.myDim); + for(int iDim = 0, iPos = 0; iDim < theMesh.myDim; iDim++, iPos += MED_TAILLE_PNOM){ + char aCoordName[MED_TAILLE_PNOM+1]; + strncpy(aCoordName,&name_coord[iPos],MED_TAILLE_PNOM); + aCoordName[MED_TAILLE_PNOM] = '\0'; + aPointsDim[iDim] = aCoordName; + } + VISU::TMesh::TPointsCoord& aPointsCoord = theMesh.myPointsCoord; aPointsCoord.resize(iNumElemEnd*theMesh.myDim); if(MYDEBUG) MESSAGE("LoadPoints - Filling coordinates of the mesh - inum_elem = "<= 0); if(MYDEBUG) MESSAGE("LoadCellsOnEntity - inum_node = "< node_map; if(inum_node) for(int i = 0; i < aNbPoints; i++) diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx index 24e06da8..a3f440c7 100644 --- a/src/OBJECT/VISU_Actor.cxx +++ b/src/OBJECT/VISU_Actor.cxx @@ -159,19 +159,24 @@ void VISU_Actor::SetShrinkable(bool theIsShrinkable){ void VISU_Actor::SetShrink(float theFactor){ if(!myIsShrinkable) return; - if(vtkPolyData* aDataSet = myPassFilter.at(1)->GetPolyDataOutput()){ + //_CS_PhB operator [] if(vtkPolyData* aDataSet = myPassFilter.at(1)->GetPolyDataOutput()){ + if(vtkPolyData* aDataSet = myPassFilter[1]->GetPolyDataOutput()){ myShrinkFilter->SetShrinkFactor(theFactor); myShrinkFilter->SetInput(aDataSet); - myPassFilter.at(2)->SetInput(myShrinkFilter->GetOutput()); + //_CS_PhB operator [] myPassFilter.at(2)->SetInput(myShrinkFilter->GetOutput()); + myPassFilter[2]->SetInput(myShrinkFilter->GetOutput()); myIsShrunk = true; } } void VISU_Actor::UnShrink(){ if(!myIsShrunk) return; - if(vtkPolyData* aDataSet = myPassFilter.at(1)->GetPolyDataOutput()){ - myPassFilter.at(2)->SetInput(aDataSet); - myPassFilter.at(2)->Modified(); + //_CS_PhB operator [] if(vtkPolyData* aDataSet = myPassFilter.at(1)->GetPolyDataOutput()){ + if(vtkPolyData* aDataSet = myPassFilter[1]->GetPolyDataOutput()){ + //_CS_PhB operator [] myPassFilter.at(2)->SetInput(aDataSet); + //_CS_PhB operator [] myPassFilter.at(2)->Modified(); + myPassFilter[2]->SetInput(aDataSet); + myPassFilter[2]->Modified(); myIsShrunk = false; } } diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx index 5b0779f1..d4465510 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx +++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx @@ -268,10 +268,13 @@ void SetupDlg::onPreferencesDlg() { // EDITPRS(VISU::CutPlanes_i, VisuGUI_CutPlanesDlg); { VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg(false, true); - aDlg->initFromPrsObject(dynamic_cast(aData.myPrs.at(0))); + //_CS_PhB :operator [] .at aDlg->initFromPrsObject(dynamic_cast(aData.myPrs.at(0))); + aDlg->initFromPrsObject(dynamic_cast(aData.myPrs[0])); + if (aDlg->exec()) { for (int i = 0; i < aData.myNbFrames; i++) - aDlg->storeToPrsObject(dynamic_cast(aData.myPrs.at(i))); + //_CS_PhB:operator [] .at aDlg->storeToPrsObject(dynamic_cast(aData.myPrs.at(i))); + aDlg->storeToPrsObject(dynamic_cast(aData.myPrs[i])); } delete aDlg; } diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in index 29cbeaee..93df0b42 100644 --- a/src/VISU_I/Makefile.in +++ b/src/VISU_I/Makefile.in @@ -52,12 +52,12 @@ CPPFLAGS += -ftemplate-depth-32 $(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES $(MED2_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \ -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(QT_MT_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeNS -lTOOLSDS \ +LDFLAGS += $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeNS -lTOOLSDS \ -lSalomeContainer -lOpUtil -lSalomeGUI -lVTKViewer -lSalomeHDFPersist \ -lVisuConvertor -lVisuPipeLine -lVisuObject -lSalomeGenericObj \ -L${KERNEL_ROOT_DIR}/lib/salome -LIBS+= $(PYTHON_LIBS) $(MED2_LIBS) $(HDF5_LIBS) -lPlot2d \ +LIBS+= $(MED2_LIBS) $(HDF5_LIBS) -lPlot2d \ -L${KERNEL_ROOT_DIR}/lib/salome # additional file to be cleaned @@ -65,4 +65,4 @@ MOSTLYCLEAN = CLEAN = DISTCLEAN = -@CONCLUDE@ \ No newline at end of file +@CONCLUDE@ diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc index 1e760bbd..353cfdf7 100644 --- a/src/VISU_I/VISUConfig.cc +++ b/src/VISU_I/VISUConfig.cc @@ -58,12 +58,14 @@ namespace VISU{ //=========================================================================== static int mySCnt = 0; + static QMutex aMutex(TRUE); - Mutex::Mutex(QMutex* theMutex): myMutex(theMutex){ + Mutex::Mutex(QMutex* theMutex): myMutex(&aMutex){ if(MYDEBUG) MESSAGE("Mutex::Mutex : "<lock(); } + Mutex::~Mutex(){ if(!(--mySCnt)) myMutex->unlock(); diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx index 9c5022d2..50acfbe1 100644 --- a/src/VISU_I/VISU_CorbaMedConvertor.cxx +++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx @@ -327,6 +327,7 @@ VISU_Convertor* VISU_MEDConvertor::Build() { VISU::TMesh &aMesh = myMeshMap[aMeshName.in()]; aMesh.myDim = aMEDMesh->getSpaceDimension(); aMesh.myName = aMeshName.in(); + aMesh.myPointsDim.resize(aMesh.myDim); VISUMED::TMesh &aMesh2 = myMeshMap2[aMeshName.in()]; aMesh2.myMesh = aMEDMesh; if(MYDEBUG) MESSAGE("VISU_MEDConvertor::Build - aMeshName = "<SetRange(aMin, aMax); + //_CS_PhB aData.myPrs.at(i)->SetRange(aMin, aMax); + aData.myPrs[i]->SetRange(aMin, aMax); if(aData.myPrsType == VISU::TISOSURFACE) - for (i = 0; i < aData.myNbFrames; i++) - if(VISU::IsoSurfaces_i* aPrs = dynamic_cast(aData.myPrs.at(i))) + for (i = 0; i < aData.myNbFrames; i++) + //_CS_PhB if(VISU::IsoSurfaces_i* aPrs = dynamic_cast(aData.myPrs.at(i))) + if(VISU::IsoSurfaces_i* aPrs = dynamic_cast(aData.myPrs[i])) aPrs->SetSubRange(aMin, aMax); } } //************************************************************************ -CORBA::Boolean VISU_TimeAnimation::generateFrames(){ +CORBA::Boolean VISU_TimeAnimation::generateFrames() { if (!myView) { MESSAGE("Viewer is nod defined for animation"); return false; @@ -246,6 +267,7 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames(){ myLastError = QString("Frame(s) for "); bool aNoError = true; + clearView(); vtkRenderer* aRen = myView->getRenderer(); @@ -255,7 +277,8 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames(){ for (long j = 0; j < aData.myNbFrames; j++) { VISU_Actor* aActor = NULL; try{ - aActor = aData.myPrs.at(j)->CreateActor(); + //_CS_PhB aActor = aData.myPrs.at(j)->CreateActor(); + aActor = aData.myPrs[j]->CreateActor(); myView->AddActor(aActor); if(j == 0) aActor->VisibilityOn(); @@ -263,14 +286,17 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames(){ aActor->VisibilityOff(); }catch(...){ //catch(std::runtime_error& exc){ aNoError = false; - myLastError += QString("%1 ").arg(aData.myTiming.at(j)); + //_CS_PhB myLastError += QString("%1 ").arg(aData.myTiming.at(j)); + myLastError += QString("%1 ").arg(aData.myTiming[j]); } - aData.myActors.at(j) = aActor; + //_CS_PhB aData.myActors.at(j) = aActor; + aData.myActors[j] = aActor; } } myFrame = 0; - myLastError += QString(" timestamp(s) cannot be created."); - emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + myLastError += QString(" timestamp(s) cannot /local/salome/SALOME2/VISU/V1_4_1a/VISU_SRC/src/VISU_I/VISU_TimeAnimation.cxxbe created."); + //_CS_PhB emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); myView->Repaint(); return aNoError; } @@ -281,14 +307,19 @@ void VISU_TimeAnimation::clearView() { MESSAGE("Viewer is nod defined for animation"); return; } + //_CS_PhB : "mt" ne sert pas dans cette methode VISU::Mutex mt(myMutex,qApp,MYDELAY); vtkRenderer* aRen = myView->getRenderer(); for (int i = 0; i < getNbFields(); i++) { FieldData& aData = myFieldsLst[i]; if (!aData.myActors.empty()) { for (int i = 0, iEnd = aData.myActors.size(); i < iEnd; i++) { - if (aData.myActors.at(i) != 0) { - aData.myActors.at(i)->RemoveFromRender(aRen); - aData.myActors.at(i)->Delete(); +//_CS_PhB if (aData.myActors.at(i) != 0) { +//_CS_PhB aData.myActors.at(i)->RemoveFromRender(aRen); +//_CS_PhB aData.myActors.at(i)->Delete(); +//_CS_PhB } + if (aData.myActors[i] != 0) { + aData.myActors[i]->RemoveFromRender(aRen); + aData.myActors[i]->Delete(); } } aData.myActors.clear(); @@ -317,14 +348,20 @@ void VISU_TimeAnimation::nextFrame() { if (myFrame < (myFieldsLst[0].myNbFrames-1)) { int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + +//_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOff(); myFrame++; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); - - emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); +//_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOn(); + +//_CS_PhB emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); myView->Repaint(); } } @@ -335,14 +372,20 @@ void VISU_TimeAnimation::prevFrame() { if (myFrame > 0) { int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + //_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOff(); + myFrame--; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); - - emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + //_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOn(); + + //_CS_PhB emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); myView->Repaint(); } } @@ -353,15 +396,20 @@ void VISU_TimeAnimation::firstFrame() { int i; for (i = 0; i < getNbFields(); i++) if(!myFieldsLst[i].myActors.empty()) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + //_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOff(); myFrame = 0; for (i = 0; i < getNbFields(); i++) if(!myFieldsLst[i].myActors.empty()) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); + //_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOn(); if(!myFieldsLst[0].myTiming.empty()){ - emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + //_CS_PhB emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); myView->Repaint(); } } @@ -371,14 +419,19 @@ void VISU_TimeAnimation::lastFrame() { stopAnimation(); int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + //_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) + //_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOff(); myFrame = myFieldsLst[0].myNbFrames-1; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); - - emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); +//_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOn(); + +//_CS_PhB emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); myView->Repaint(); } @@ -393,13 +446,20 @@ void VISU_TimeAnimation::gotoFrame(CORBA::Long theFrame) { qApp->syncX(); int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); +//_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOff(); + myFrame = theFrame; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors.at(myFrame) != 0) - myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); - emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); +//_CS_PhB if (myFieldsLst[i].myActors.at(myFrame) != 0) +//_CS_PhB myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); + if (myFieldsLst[i].myActors[myFrame] != 0) + myFieldsLst[i].myActors[myFrame]->VisibilityOn(); + +//_CS_PhB emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); myView->Repaint(); qApp->flushX(); qApp->processEvents(3); @@ -413,7 +473,8 @@ VISU::ScalarMap_ptr VISU_TimeAnimation::getPresentation(CORBA::Long theField, CO return VISU::ScalarMap::_nil(); if ((theFrame < 0) || (theFrame > (myFieldsLst[theField].myNbFrames - 1))) return VISU::ScalarMap::_nil(); - return myFieldsLst[theField].myPrs.at(theFrame)->_this(); +//_CS_PhB return myFieldsLst[theField].myPrs.at(theFrame)->_this(); + return myFieldsLst[theField].myPrs[theFrame]->_this(); } @@ -433,35 +494,44 @@ void VISU_TimeAnimation::run() { double aOneVal; bool isDumping = !myDumpPath.isEmpty(); aOneVal = (myFieldsLst[0].myNbFrames > 2) ? - myFieldsLst[0].myTiming.at(1) - myFieldsLst[0].myTiming.at(0) : 1; + //_CS_PhB myFieldsLst[0].myTiming.at(1) - myFieldsLst[0].myTiming.at(0) : 1; + myFieldsLst[0].myTiming[1] - myFieldsLst[0].myTiming[0] : 1; qApp->lock(); while (myIsActive) { - emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + //_CS_PhB emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); for (int i = 0; i < getNbFields(); i++) { FieldData& aData = myFieldsLst[i]; if (myFrame > 0) { - if (aData.myActors.at(myFrame-1) != 0) - aData.myActors.at(myFrame-1)->VisibilityOff(); +//_CS_PhB if (aData.myActors.at(myFrame-1) != 0) +//_CS_PhB aData.myActors.at(myFrame-1)->VisibilityOff(); + if (aData.myActors[myFrame-1] != 0) + aData.myActors[myFrame-1]->VisibilityOff(); } else { - if (aData.myActors.at(aData.myNbFrames-1) != 0) - aData.myActors.at(aData.myNbFrames-1)->VisibilityOff(); +//_CS_PhB if (aData.myActors.at(aData.myNbFrames-1) != 0) +//_CS_PhB aData.myActors.at(aData.myNbFrames-1)->VisibilityOff(); + if (aData.myActors[aData.myNbFrames-1] != 0) + aData.myActors[aData.myNbFrames-1]->VisibilityOff(); } - if (aData.myActors.at(myFrame) != 0) { - aData.myActors.at(myFrame)->VisibilityOn(); +//_CS_PhB if (aData.myActors.at(myFrame) != 0) { +//_CS_PhB aData.myActors.at(myFrame)->VisibilityOn(); + if (aData.myActors[myFrame] != 0) { + aData.myActors[myFrame]->VisibilityOn(); } } myView->Repaint(false); if (isDumping) { QPixmap px = QPixmap::grabWindow(myView->getViewWidget()->winId()); QString aFile(myDumpPath); - QString aName = QString("%1").arg(myFieldsLst[0].myTiming.at(myFrame)); +//_CS_PhB QString aName = QString("%1").arg(myFieldsLst[0].myTiming.at(myFrame)); + QString aName = QString("%1").arg(myFieldsLst[0].myTiming[myFrame]); int aPos = -1; while ((aPos = aName.find(".")) > -1 ) aName.replace(aPos, 1, "_"); aFile += aName; aFile += ".jpeg"; px.save(aFile, "JPEG"); - } + }//_CS_PhB if (!isDumping) { if (myProportional) { switch (myFrame) { @@ -470,13 +540,15 @@ void VISU_TimeAnimation::run() { break; case 1: if (myFieldsLst[0].myNbFrames > 2) - k = (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal; +//_CS_PhB k = (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal; + k = (myFieldsLst[0].myTiming[myFrame+1] - myFieldsLst[0].myTiming[myFrame])/aOneVal; else k = 1; break; default: k = (myFrame < (myFieldsLst[0].myNbFrames-1))? - (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal : 1; +//_CS_PhB (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal : 1; + (myFieldsLst[0].myTiming[myFrame+1] - myFieldsLst[0].myTiming[myFrame])/aOneVal : 1; } } else k = 1;