diff --git a/externalProgramPath.py b/externalProgramPath.py index 6b169e8dee301d0a7537919b7b667cd676b0788d..f7565f992306776e79bc297b0a204b61e6d191c2 100755 --- a/externalProgramPath.py +++ b/externalProgramPath.py @@ -46,6 +46,11 @@ class ExtProgs(PRMSet): TextPRM(self.pars, 'LATEX', 'Latex', 'latex') TextPRM(self.pars, 'GHOSTSCRIPT', 'GhostScript', 'gs') TextPRM(self.pars, 'IMAGEMAGICK', 'Image Magick', 'convert') + # Arcelor + TextPRM(self.pars, 'LAM3', 'Lam3', 'lam3') + TextPRM(self.pars, 'TEC3', 'Tec3', 'tec3') + TextPRM(self.pars, 'XDONNEE', 'X-Donnee', 'xd') + else: # windows # Mesh generation TextPRM(self.pars, 'SAMCEF', 'Samcef', 'samcef.cmd') @@ -62,6 +67,11 @@ class ExtProgs(PRMSet): TextPRM(self.pars, 'GHOSTSCRIPT', 'GhostScript', 'gswin32c.exe') TextPRM(self.pars, 'IMAGEMAGICK', 'Image Magick', 'convert.exe') + # Arcelor + TextPRM(self.pars, 'LAM3', 'Lam3', 'lam3.exe') + TextPRM(self.pars, 'TEC3', 'Tec3', 'tec3.exe') + TextPRM(self.pars, 'XDONNEE', 'X-Donnee', 'xd.exe') + def checkValidity(self, key): if key not in self.pars : print("%s is not a valid external program key from externalProgramPath... "%key) @@ -96,6 +106,10 @@ class ExtProgs(PRMSet): PRMAction(self.actions, 'i', self.pars['GHOSTSCRIPT']) PRMAction(self.actions, 'j', self.pars['IMAGEMAGICK']) NoAction(self.actions) + PRMAction(self.actions, 'k', self.pars['LAM3']) + PRMAction(self.actions, 'l', self.pars['TEC3']) + PRMAction(self.actions, 'm', self.pars['XDONNEE']) + NoAction(self.actions) SaveAction(self.actions , 'S') QuitAction(self.actions , 'Q') diff --git a/externalProgramPathGui.pyw b/externalProgramPathGui.pyw index eb7beaf9a0aab098d944416e73ea26162db992d0..085a6bf8a0c7a5f38fc2dee786a6cd5f8983c920 100755 --- a/externalProgramPathGui.pyw +++ b/externalProgramPathGui.pyw @@ -111,6 +111,16 @@ class ExtProgsConfGui(QWidget): self.sf['GHOSTSCRIPT'] = ExeFileLine(self, grplay3, self.extProgPath.pars['GHOSTSCRIPT'], exeFileType, 1, 0, 4) self.sf['IMAGEMAGICK'] = ExeFileLine(self, grplay3, self.extProgPath.pars['IMAGEMAGICK'], exeFileType, 2, 0, 4) + # Outils Arcelor + self.arcelorGrpBox = QGroupBox("Arcelor Tools") + box.addWidget(self.arcelorGrpBox) + grplay4 = QGridLayout() + grplay4.setColumnStretch(2,1) + self.arcelorGrpBox.setLayout(grplay4) + self.sf['LAM3'] = ExeFileLine(self, grplay4, self.extProgPath.pars['LAM3'], exeFileType, 0, 0, 4) + self.sf['TEC3'] = ExeFileLine(self, grplay4, self.extProgPath.pars['TEC3'], exeFileType, 1, 0, 4) + self.sf['XDONNEE'] = ExeFileLine(self, grplay4, self.extProgPath.pars['XDONNEE'], exeFileType, 2, 0, 4) + def buildButtonFrame(self, box): # == Buttons Frame == butframe = QFrame()