Skip to content

fix(trackcvg): dynamic x-axis label based on residuals header #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
florian-simvia wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −10
Open

fix(trackcvg): dynamic x-axis label based on residuals header #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 41 additions & 10 deletions python/code_saturne/gui/trackcvg/MainView.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ def __init__(self, parent=None, subplotNb=1, width=5, height=4, dpi=100):
super(MyMplCanvas,self).__init__(self.fig)
self.yAxe = numpy.array([0])
self.xAxe = numpy.array([0])
self.x_labels = {}
self.axes = []

if subplotNb == 1:
Expand Down Expand Up @@ -482,7 +483,7 @@ def update_figure_listing(self, name, data, nb_probes, lstProbes):
def drawFigure(self):
for it in range(len(self.axes)):
self.axes[it].grid(True)
self.axes[it].set_xlabel("time (s)")
self.axes[it].set_xlabel(self.x_labels.get(it, "Time (s)"))
self.axes[0].set_yscale('log')

self.fig.canvas.draw()
Expand Down Expand Up @@ -686,6 +687,7 @@ def caseClose(self):
self.fileList = []
self.listingVariable = []
self.listFileProbes = {}
self.xLabel = "Time (s)"
self.modelCases = CaseStandardItemModel(self.parent, [], [])
self.treeViewDirectory.setModel(self.modelCases)
self.modelCases.dataChanged.connect(self.treeViewChanged)
Expand Down Expand Up @@ -862,6 +864,7 @@ def loadDirectoryContent(self):
else:
if fl == 'residuals.csv':
self.listingVariable = self.readResidualsVariableListCSV(rep)
self.xLabel = self.detectXLabelCsv(rep)
self.fileList.append([fl, rep, "on", 1, len(self.listingVariable) + 1])
# read variable list for Time residual
idx = 0
Expand All @@ -873,6 +876,7 @@ def loadDirectoryContent(self):
self.listFileProbes[fl] = ll
elif fl == 'residuals.dat':
self.listingVariable = self.readResidualsVariableListDAT(rep)
self.xLabel = self.detectXLabelDat(rep)
self.fileList.append([fl, rep, "on", 1, len(self.listingVariable) + 1])
# read variable list for Time residual
idx = 0
Expand Down Expand Up @@ -975,22 +979,22 @@ def updateView(self):
"""
"""
self.dc.clear()
self.dc.x_labels = {}
for (name, fle, status, subplot_id, probes_number) in self.fileList:
if status == "on" or status == "onoff":
base, ext = os.path.splitext(fle)
if name == 'residuals.csv':
data = self.ReadCsvFile(fle, probes_number)
if status == "on" or status == "onoff":
self.dc.update_figure_listing(self.listingVariable,
data,
probes_number,
self.listFileProbes[name])
elif name == 'residuals.dat':
data = self.ReadDatFile(fle, probes_number)
if name == 'residuals.csv' or name == 'residuals.dat':
if name == 'residuals.csv':
data = self.ReadCsvFile(fle, probes_number)
else:
data = self.ReadDatFile(fle, probes_number)
if status == "on" or status == "onoff":
self.dc.update_figure_listing(self.listingVariable,
data, probes_number,
self.listFileProbes[name])
for probe in self.listFileProbes[name]:
if probe.status == "on":
self.dc.x_labels[probe.subplot_id - 1] = self.xLabel
elif ext == ".csv":
data = self.ReadCsvFile(fle, probes_number)
nm, ext = os.path.splitext(name)
Expand Down Expand Up @@ -1144,6 +1148,32 @@ def readResidualsVariableListDAT(self, name):
return lst


def detectXLabelCsv(self, name):
"""
Detect x-axis label from CSV header first column.
"""
with open(name, 'r') as f:
header = f.readline()
first_col = header.split(',')[0].strip().lower()
if first_col in ('iteration', 'nt'):
return "Iteration number"
return "Time (s)"


def detectXLabelDat(self, name):
"""
Detect x-axis label from DAT header first column.
"""
with open(name, 'r') as f:
header = f.readline().lstrip()
if header.startswith('#'):
header = header[1:].lstrip()
tokens = header.split()
if tokens and tokens[0].strip().lower() in ('iteration', 'nt'):
return "Iteration number"
return "Time (s)"


def SaveState(self):
"""
"""
Expand Down Expand Up @@ -1263,6 +1293,7 @@ def __init__(self,
self.fileList = []
self.listingVariable = []
self.listFileProbes = {}
self.xLabel = "Time (s)"
self.timer = QTimer()
self.timer.start(int(self.timeRefresh * 1000))

Expand Down