Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2436f2d
)
[Verima] Small fixes
author
Renaud Nédélec
<renaud.nedelec@opencascade.com>
Wed, 7 May 2014 13:44:39 +0000
(15:44 +0200)
committer
Renaud Nédélec
<renaud.nedelec@opencascade.com>
Wed, 7 May 2014 13:44:39 +0000
(15:44 +0200)
src/Tools/Verima/CreeDocuments/templatesHtml/CMakeLists.txt
patch
|
blob
|
history
src/Tools/Verima/Gui/maFenetreChoix.py
patch
|
blob
|
history
src/Tools/Verima/Gui/monNomBase.py
patch
|
blob
|
history
src/Tools/Verima/Gui/visualiseDatabase.py
patch
|
blob
|
history
src/Tools/Verima/lance.py
patch
|
blob
|
history
diff --git
a/src/Tools/Verima/CreeDocuments/templatesHtml/CMakeLists.txt
b/src/Tools/Verima/CreeDocuments/templatesHtml/CMakeLists.txt
index c3c31a197db9cd95d0bcd04f5dd1c7fe4278f08f..32566e3050007b521827130912e07bc99e6a0d81 100644
(file)
--- a/
src/Tools/Verima/CreeDocuments/templatesHtml/CMakeLists.txt
+++ b/
src/Tools/Verima/CreeDocuments/templatesHtml/CMakeLists.txt
@@
-34,4
+34,4
@@
SET(plugin_HTML_FILES
# --- rules ---
# --- rules ---
-SALOME_INSTALL_SCRIPTS("${plugin_HTML_FILES}" ${SALOME_SMESH_INSTALL_PLUGINS}/CreeDocuments/templatesHtml)
+SALOME_INSTALL_SCRIPTS("${plugin_HTML_FILES}" ${SALOME_SMESH_INSTALL_PLUGINS}/
Verima/
CreeDocuments/templatesHtml)
diff --git
a/src/Tools/Verima/Gui/maFenetreChoix.py
b/src/Tools/Verima/Gui/maFenetreChoix.py
index 359ceb4add2702a319352367b748bc9aec7de9f2..7ddf3fbc2c57c623362a2698a7627c0323dd8f7f 100644
(file)
--- a/
src/Tools/Verima/Gui/maFenetreChoix.py
+++ b/
src/Tools/Verima/Gui/maFenetreChoix.py
@@
-1,4
+1,4
@@
-from desFenetreChoix import Ui_Choix
+from desFenetreChoix
_ui
import Ui_Choix
from PyQt4 import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4 import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
diff --git
a/src/Tools/Verima/Gui/monNomBase.py
b/src/Tools/Verima/Gui/monNomBase.py
index a3d4f0468eee4764d334b60e0adf70ad10acc904..9426d929b4cb4dfe998f8db1e20c4e4005d358a8 100644
(file)
--- a/
src/Tools/Verima/Gui/monNomBase.py
+++ b/
src/Tools/Verima/Gui/monNomBase.py
@@
-1,7
+1,7
@@
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4.QtSql import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4.QtSql import *
-from nomBase import Ui_LEDataBaseName
+from nomBase
_ui
import Ui_LEDataBaseName
class DataBaseName(Ui_LEDataBaseName,QDialog):
class DataBaseName(Ui_LEDataBaseName,QDialog):
diff --git
a/src/Tools/Verima/Gui/visualiseDatabase.py
b/src/Tools/Verima/Gui/visualiseDatabase.py
index 82bfcfcae24336ff9bc87e8b7d4bcb04fa9d99c3..c4b83b377a6f6f3e46ce8690908225851ed5534f 100755
(executable)
--- a/
src/Tools/Verima/Gui/visualiseDatabase.py
+++ b/
src/Tools/Verima/Gui/visualiseDatabase.py
@@
-6,7
+6,7
@@
installDir=os.path.join(rep,'..')
sys.path.insert(0,installDir)
from PyQt4 import QtGui,QtCore
sys.path.insert(0,installDir)
from PyQt4 import QtGui,QtCore
-from Gui.maFenetreChoix import MaFenetreChoix
+from Gui.maFenetreChoix
_ui
import MaFenetreChoix
from Base.dataBase import Base
from Base.dataBase import Base
diff --git
a/src/Tools/Verima/lance.py
b/src/Tools/Verima/lance.py
index 32a42b7613f8c7c1feea5380c75d0f52dd72980e..8f22c58579aaf4ff9946f3d09d8eb7760b480040 100755
(executable)
--- a/
src/Tools/Verima/lance.py
+++ b/
src/Tools/Verima/lance.py
@@
-3,7
+3,7
@@
from PyQt4 import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4 import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
-from Gui.myMain import Ui_Gestion
+from Gui.myMain
_ui
import Ui_Gestion
import sys
import sys