]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
NewGeom is renamed to SHAPER: "Shaper" named button is shown in SALOME, :SALOME*...
authornds <nds@opencascade.com>
Tue, 1 Mar 2016 09:49:59 +0000 (12:49 +0300)
committernds <nds@opencascade.com>
Tue, 1 Mar 2016 09:50:26 +0000 (12:50 +0300)
32 files changed:
test.squish/objects_salome.map
test.squish/shared/scripts/common.py
test.squish/suite_FEATURE_BOOLEAN/tst_boolean_001/test.py
test.squish/suite_FEATURE_BOOLEAN/tst_boolean_002/test.py
test.squish/suite_FEATURE_BOOLEAN/tst_boolean_003/test.py
test.squish/suite_FEATURE_CONSTRUCTION/tst_construction_001/test.py
test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_001/test.py
test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_002/test.py
test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_003/test.py
test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_004/test.py
test.squish/suite_FEATURE_EXTRUSION/tst_extrusion_006/test.py
test.squish/suite_FEATURE_PARAMETERS/shared/steps/steps.py
test.squish/suite_FEATURE_PARTITION/tst_partition_001/test.py
test.squish/suite_FEATURE_REVOLUTION/tst_revolution_001/test.py
test.squish/suite_FEATURE_REVOLUTION/tst_revolution_003/test.py
test.squish/suite_FEATURE_REVOLUTION/tst_revolution_004/test.py
test.squish/suite_FEATURE_REVOLUTION/tst_revolution_005/test.py
test.squish/suite_FEATURE_REVOLUTION/tst_revolution_006/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_003/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_004/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_006/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_007/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_009/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_010/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_011/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_012/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_013/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_014/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_015/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_016/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_017/test.py
test.squish/suite_FEATURE_SKETCH/tst_sketch_018/test.py

index 9a81c80f26a2d0ef20b661b335eef60f626f4e8c..0e32503cde54844e9f64aaf25aedc423de26dd18 100644 (file)
 :SALOME*.Mirror_XGUI_PropertyPanel     {name='property_panel_dock' type='XGUI_PropertyPanel' visible='1' window=':SALOME*_STD_TabDesktop' windowTitle='Mirror'}
 :SALOME*.Modules_QtxToolBar    {name='SalomeModules' type='QtxToolBar' visible='1' window=':SALOME*_STD_TabDesktop' windowTitle='Modules'}
 :SALOME*.New part_QToolButton  {text='New part' type='QToolButton' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop'}
-:SALOME*.SHAPER_QToolButton    {text='SHAPER' type='QToolButton' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop'}
+:SALOME*.Shaper_QToolButton    {text='Shaper' type='QToolButton' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop'}
 :SALOME*.New_QToolButton       {text='New' type='QToolButton' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop'}
 :SALOME*.OCC scene:1 - viewer:1 - 3D_SOCC_ViewWindow   {type='SOCC_ViewWindow' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop' windowTitle='OCC scene:1 - viewer:1 - 3D'}
 :SALOME*.OCC scene:1 - viewer:1_OCCViewer_ViewFrame    {type='OCCViewer_ViewFrame' unnamed='1' visible='1' window=':SALOME*_STD_TabDesktop' windowTitle='OCC scene:1 - viewer:1'}
index e100a1dd48c3581c09af66428eeee64cd065f987..2c01e6c521504b32c5f66d96436056793242c8e7 100644 (file)
@@ -30,7 +30,7 @@ def set_defaults():
     waitForObject(":SALOME*_STD_TabDesktop").resize(1024, 768)
 
 def activate_SHAPER():
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     clickButton(waitForObject(":Activate module.New_QPushButton"))
 
 def close_application():
index 33360b03147933c27515e06ebb737544d01a9d4a..dc12fda52cd85e8854b0c2c249d57fa17befcde1 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_boolean_001.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 2752b6c4b49e3738aa1f2a06a4dbab6fdd3faf1f..c32035eebe4bd514a4bdf744d13ea5e633434b7d 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_boolean_001.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 610a12557a338df80de86f57ef02aae1c2572492..35a5a179d360abbd843ffa015a1630f1a7d6cba6 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_boolean_001.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 3769427954522d53d6682c0e82bb9d9f8c22f429..51552b350e9292cf770492b04ddad05f91ae2ae1 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_construction_001.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index ab17fec13364416e874019553c46394cdf8ecf59..80011b435adf06c37f7ccf254df5df20a447da5c 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_extrusion_001.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 3788f6fd5177c9dbb11d0434491637c8b86bfc53..347a167b515c6dfc1b683ae2cf5cce48c7812624 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_extrusion_002.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 9a42e1b8d02fc994a1fbedf5496a8d52eccc8272..fe7d2c168fbd3ee32e8be6558bb819cd3fd007da 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_extrusion_003.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index a2bbf63f1d5d8c4324de69cb890b4512d502c05f..380b2f866119209e87ea85dfb6275a8baed548b0 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_extrusion_003.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 39796a8011f57cfde9f863c19795db4f1a976a22..3eab5ceaf8ea4968acb335f4d19eec4eaf5cc9d3 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_extrusion_006.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index e65974ab17c94eb551b1bbd140f2128f69947e1c..12f0e3bb3568957efefd52c4a3efd24ce9f38a98 100644 (file)
@@ -33,7 +33,7 @@ import __builtin__
 @Given("Launch application in salome mode")
 def step(context):
     startApplication("salome_run.sh")
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     clickButton(waitForObject(":Activate module.New_QPushButton"))
 
 @When("Create parameter a=30")
index 08343d7aab183c0756c5bce1b0d0045824bc3d03..be1b097147de990b0f1a0b963985d38eee8e148b 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_partition_001.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 64222b58e6e82c87be47a83f2e17b662562820c0..bd28d66bfb525766d076b306c7aa3a05a59e4760 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_revolution_001.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 4d13455b4a5e3acaaeb48c558c6b738af0e9aebc..d8c2668290016ce3da2e6c508018ea622af25190 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_revolution_003.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 340a95255ff204c6a2e33b35ab243dac5b9605a8..913794dff3557aacfc95f4e6e8a0d1a4998af86e 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_revolution_004.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 9b593873fc58fd37cdcb91d0f3ba07046f6ebe87..b17a773a67af66b8775bb424eeff398d71f80e5c 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_revolution_005.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index dbf56a7ecc3433f261b3c7d30db200697f191edb..1578894d2a20b60982a148d00690424c4c731c81 100644 (file)
@@ -19,7 +19,7 @@ def main():
     open(DATA_PATH + "/for_revolution_003.hdf")
 
     # [step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
 
     # [step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 1298d0115162c59e00d51253fc5bd6166627a759..8e4533e915d2d37b1c60ee8450d045bc2c6b8fd2 100644 (file)
@@ -53,7 +53,7 @@ def main():
     #[step} Open just saved file  
     open("RESULTS_PATH + sketch_003.hdf")
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 25fee064141cecf0df4a2970d1c094da28812938..9acd65750d36a1b7079a2d60ed3066fa0441b02b 100644 (file)
@@ -21,7 +21,7 @@ def main():
     open(os.path.join(DATA_PATH, "for_sketch_004.hdf"))
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 9afcbde3f6058fcd661ffb9fa96d3cc62c1a1984..64a5bc28f4740dbf4e38fe8177bdd4f2236e9f39 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_006.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 84f08c3ab9b12f96f3ca286be547cd5db63bb75f..6f9c6641f309496197e4c6da9bbb40380a2874f6 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_007.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Activate Part_1
     waitForObjectItem(":Object browser_XGUI_DataTree", "Part\\_1 (Not loaded)")
index 0bb5feb6ed3ecebfe87bdc4bb81701e7d1b648ce..f40cc9016690f94ff2a8aee7a5d33fc8c8ffeb7c 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_009.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index c6c28ea9b8f5c32a496cedfdf176d9035f36f815..d01889e58d47423a419573dac62331e506f0fc8a 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_010.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index fadfc027e7a673feb76a011826099571f6b6e5d7..84ba6e41ae1d85b7c256c8b7077adf819f282e2a 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_010.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index 18ddd081bfd4b57ada6746f8d8a3fef76e7ddf6c..d764b7048121150d6fb0bd1b359892639af07da7 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_012.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index c4486342a04421633233224df3b86362cc6f6660..cada7ed681de7329dca560dbc4a89e2d58db34f3 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_013.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index cacf4197d5f25eeb695e7649250002956157ad34..922a09ff811408e211d9a0afd3d830423776e40b 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_014.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index 0c310c565f35773d7b2e17ba6dfe1ece46a46ffc..171c8e048b05d59db9ac6d76e67d83d3f477de48 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_015.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index 80e1f8ab433caeaf420fcd0f66cf8ecc1ccb761e..e3f2457ba4047a31ff417087a16dba7da3032a6c 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_016.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index ac2ce083419fb0519d41574f975fe13903ae0deb..445fe97563facebf75ff319dea656555792c6d88 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_016.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")
index a1183e833e65b03f016257203565dde465ba4690..22e7edc48819cd7ba293ef59dfcb76cc17b6c669 100644 (file)
@@ -20,7 +20,7 @@ def main():
     open(DATA_PATH + "/for_sketch_018.hdf")
     
     #[step] Activate SHAPER
-    clickButton(waitForObject(":SALOME*.SHAPER_QToolButton"))
+    clickButton(waitForObject(":SALOME*.Shaper_QToolButton"))
     
     #[step] Edit 'Sketch_1'
     waitForObjectItem(":Object browser_XGUI_DataTree", "Sketch\\_1")