Salome HOME
projects
/
modules
/
adao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Nouvelle version de Jean-Philippe ARGAUD
[modules/adao.git]
/
src
/
daComposant
/
daDiagnostics
/
PlotVector.py
diff --git
a/src/daComposant/daDiagnostics/PlotVector.py
b/src/daComposant/daDiagnostics/PlotVector.py
index 97b337215df6215c1aae76df9665f3d5999f5a85..7a42538c17138e10b02ac064f32c36488562263d 100644
(file)
--- a/
src/daComposant/daDiagnostics/PlotVector.py
+++ b/
src/daComposant/daDiagnostics/PlotVector.py
@@
-1,6
+1,6
@@
#-*-coding:iso-8859-1-*-
#
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-20
09
EDF R&D
+# Copyright (C) 2008-20
10
EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-23,16
+23,14
@@
__doc__ = """
"""
__author__ = "Jean-Philippe ARGAUD - Juillet 2008"
"""
__author__ = "Jean-Philippe ARGAUD - Juillet 2008"
-import sys ; sys.path.insert(0, "../daCore")
-
import os.path
import numpy
import os.path
import numpy
-from
BasicObjects import Diagnostic
+from
daCore import BasicObjects
# ==============================================================================
# ==============================================================================
-class ElementaryDiagnostic(Diagnostic):
+class ElementaryDiagnostic(
BasicObjects.
Diagnostic):
def __init__(self, name = "", unit = "", basetype = None, parameters = {}):
def __init__(self, name = "", unit = "", basetype = None, parameters = {}):
- Diagnostic.__init__(self, name, parameters)
+
BasicObjects.
Diagnostic.__init__(self, name, parameters)
try:
import Gnuplot
self.__gnuplot = Gnuplot
try:
import Gnuplot
self.__gnuplot = Gnuplot
@@
-72,7
+70,7
@@
class ElementaryDiagnostic(Diagnostic):
return 1
def calculate(self, vector = None, steps = None,
return 1
def calculate(self, vector = None, steps = None,
- title = "", xlabel = "", ylabel = "", ltitle =
None
,
+ title = "", xlabel = "", ylabel = "", ltitle =
""
,
geometry = "600x400",
filename = "",
persist = False,
geometry = "600x400",
filename = "",
persist = False,
@@
-100,8
+98,6
@@
class ElementaryDiagnostic(Diagnostic):
"""
if vector is None:
raise ValueError("One vector must be given to plot it.")
"""
if vector is None:
raise ValueError("One vector must be given to plot it.")
- if ltitle is None:
- ltitle = ""
Vector = numpy.array(vector)
if Vector.size < 1:
raise ValueError("The given vector must not be empty")
Vector = numpy.array(vector)
if Vector.size < 1:
raise ValueError("The given vector must not be empty")