- if isinstance(parametres, dict) :
- tableau = Tableau(parent, parametres['ira'])
- else :
- tableau = Tableau(parent, parametres)
- tableau.parametres = self.conf
- tableau.dictpathout = PathOut(filename = tableau.parametres['filename'], dirout = self.conf['pathout'], analyse_type = self.conf['type'])
- tableau.dictpathout.basefiles(ChdTxtPathOut)
- tableau.read_tableau(tableau.dictpathout['db'])
- if self.parent.tree.IsInTree(uuid = self.conf['uuid']) :
- self.parent.tree.GiveFocus(uuid = self.conf['uuid'], bold = True)
- else :
- self.parent.tree.AddAnalyse(self.conf, bold = True)
- self.doopen(tableau)
+ matrix = Tableau(self.parent, parametres = self.parent.history.matrix[self.parent.history.ordermatrix[self.conf['matrix']]])
+ matrix.open()
+
+ #if isinstance(parametres, dict) :
+ # tableau = Tableau(parent, parametres['ira'])
+ #else :
+ # tableau = Tableau(parent, parametres)
+ #tableau.parametres = self.conf
+ #tableau.dictpathout = PathOut(filename = tableau.parametres['filename'], dirout = self.conf['pathout'], analyse_type = self.conf['type'])
+ #tableau.dictpathout.basefiles(ChdTxtPathOut)
+ #tableau.read_tableau(tableau.dictpathout['db'])
+ #if self.parent.tree.IsInTree(uuid = self.conf['uuid']) :
+
+ self.parent.tree.GiveFocus(uuid = self.conf['uuid'], bold = True)
+ self.doopen(matrix)
+ else :
+ self.parent.tree.AddAnalyse(self.conf, bold = True)