From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Tue, 11 May 2010 15:12:04 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V2_0~93
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4c42f063be42e0c8ede64d7507fe21b0ea66241c;p=modules%2Feficas.git

*** empty log message ***
---

diff --git a/Map/qtEficas_map.py b/Map/qtEficas_map.py
index f9cd06e6..d1b84a48 100755
--- a/Map/qtEficas_map.py
+++ b/Map/qtEficas_map.py
@@ -21,7 +21,7 @@
 # ======================================================================
 
 """
-   Ce module sert à lancer EFICAS configuré pour Perfect
+   Ce module sert à lancer EFICAS configuré pour Perfect
 """
 # Modules Python
 
@@ -31,7 +31,30 @@ name='prefs_'+prefs.code
 __import__(name)
 
 import sys
+from PyQt4.QtGui import *
+
+from Editeur  import import_code
+from Editeur  import session
+from qtEficas import Appli
+
 from InterfaceQT4 import eficas_go
+from InterfaceQT4 import monChoixMap
+
+class ChoixCata:
+ def __init__(self):
+   self.schema=""
+   self.module=""
+   self.nom=""
+  
+
+MonChoixCata=ChoixCata()
+app = QApplication(sys.argv)
+ChoixMap = monChoixMap.MonChoixMap(MonChoixCata) 
+ChoixMap.show()
+res=app.exec_()
+
+
+
 #permet de choisir le module
-#eficas_go.lance_eficas(code=prefs.code,choix="oui")
-eficas_go.lance_eficas(code=prefs.code,choix="non")
+#eficas_go.lance_eficas(code=prefs.code)
+#eficas_go.lance_eficas(code=prefs.code,choix="non")
diff --git a/UiQT4/desChoixMap.ui b/UiQT4/desChoixMap.ui
index e4300c8a..dc8e8a83 100644
--- a/UiQT4/desChoixMap.ui
+++ b/UiQT4/desChoixMap.ui
@@ -1,85 +1,198 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DChoixMap</class>
- <widget class="QWidget" name="DChoixMap">
-  <property name="geometry">
+<ui version="4.0" >
+ <class>ChoixMap</class>
+ <widget class="QDialog" name="ChoixMap" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>788</width>
+    <height>752</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
+  <property name="windowTitle" >
+   <string>Dialog</string>
   </property>
-  <widget class="QPushButton" name="Pb1">
-   <property name="geometry">
+  <widget class="QLabel" name="label" >
+   <property name="geometry" >
     <rect>
-     <x>-8</x>
-     <y>20</y>
-     <width>121</width>
-     <height>141</height>
+     <x>10</x>
+     <y>370</y>
+     <width>141</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>scheme description :</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButton" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>440</y>
+     <width>83</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Doc</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="PBIconeMap" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>30</y>
+     <width>83</width>
+     <height>91</height>
     </rect>
    </property>
-   <property name="text">
+   <property name="text" >
     <string/>
    </property>
-   <property name="icon">
+   <property name="icon" >
     <iconset>
-     <normaloff>redwood.png</normaloff>redwood.png</iconset>
+     <normaloff>../../../map.ppm</normaloff>../../../map.ppm</iconset>
    </property>
-   <property name="iconSize">
+   <property name="iconSize" >
     <size>
-     <width>150</width>
-     <height>150</height>
+     <width>160</width>
+     <height>160</height>
     </size>
    </property>
   </widget>
-  <widget class="QPushButton" name="Pb2">
-   <property name="geometry">
+  <widget class="QPushButton" name="pushButton_3" >
+   <property name="geometry" >
     <rect>
-     <x>130</x>
-     <y>20</y>
-     <width>121</width>
-     <height>141</height>
+     <x>670</x>
+     <y>30</y>
+     <width>81</width>
+     <height>101</height>
     </rect>
    </property>
-   <property name="text">
+   <property name="text" >
     <string/>
    </property>
-   <property name="icon">
+   <property name="icon" >
     <iconset>
-     <normaloff>brisbane.png</normaloff>brisbane.png</iconset>
+     <normaloff>image120.png</normaloff>image120.png</iconset>
    </property>
-   <property name="iconSize">
+   <property name="iconSize" >
     <size>
-     <width>150</width>
+     <width>160</width>
      <height>160</height>
     </size>
    </property>
   </widget>
-  <widget class="QPushButton" name="Pb3">
-   <property name="geometry">
+  <widget class="QGroupBox" name="groupBoxScheme" >
+   <property name="geometry" >
     <rect>
-     <x>260</x>
+     <x>390</x>
      <y>20</y>
-     <width>131</width>
-     <height>141</height>
+     <width>261</width>
+     <height>311</height>
     </rect>
    </property>
-   <property name="text">
-    <string/>
+   <property name="title" >
+    <string>Scheme</string>
    </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>berlin.png</normaloff>berlin.png</iconset>
+  </widget>
+  <widget class="QGroupBox" name="groupBoxModule" >
+   <property name="geometry" >
+    <rect>
+     <x>110</x>
+     <y>20</y>
+     <width>261</width>
+     <height>311</height>
+    </rect>
    </property>
-   <property name="iconSize">
-    <size>
-     <width>150</width>
-     <height>150</height>
-    </size>
+   <property name="title" >
+    <string>Modules</string>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout" >
+    <item>
+     <widget class="QRadioButton" name="RBM1" >
+      <property name="text" >
+       <string>oxides</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM2" >
+      <property name="text" >
+       <string>scc</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM3" >
+      <property name="text" >
+       <string>concrete</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM4" >
+      <property name="text" >
+       <string>polycristals</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM5" >
+      <property name="text" >
+       <string>polymers</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM6" >
+      <property name="text" >
+       <string>micro</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM7" >
+      <property name="text" >
+       <string>seal</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM8" >
+      <property name="text" >
+       <string>mox</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM9" >
+      <property name="text" >
+       <string>nano</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QRadioButton" name="RBM10" >
+      <property name="text" >
+       <string>insulator</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="labelScheme" >
+   <property name="geometry" >
+    <rect>
+     <x>160</x>
+     <y>380</y>
+     <width>551</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string/>
    </property>
   </widget>
  </widget>