Salome HOME
modules/geom.git
17 years agoUpdatin GUI documentation for PAL13459 V3_2_6a1
maintenance team [Mon, 5 Mar 2007 12:45:26 +0000 (12:45 +0000)]
Updatin GUI documentation for PAL13459

17 years agoUpdate of GUI documentation for PAL12874
maintenance team [Mon, 5 Mar 2007 11:51:52 +0000 (11:51 +0000)]
Update of GUI documentation for PAL12874

17 years agoUpdate GUI documentation for PAL13455.
maintenance team [Mon, 5 Mar 2007 11:43:40 +0000 (11:43 +0000)]
Update GUI documentation for PAL13455.

17 years agoUpdate GUI documentation for PAL12719.
maintenance team [Mon, 5 Mar 2007 11:29:07 +0000 (11:29 +0000)]
Update GUI documentation for PAL12719.

17 years agoUpdate GUI documentation for PAL12719
maintenance team [Mon, 5 Mar 2007 11:25:43 +0000 (11:25 +0000)]
Update GUI documentation for PAL12719

17 years agoIncrement SALOME version number : 3.2.6
vsr [Fri, 2 Mar 2007 13:53:49 +0000 (13:53 +0000)]
Increment SALOME version number : 3.2.6

17 years agoFix for PAL13459(EDF PAL 296 : Geom Sketcher Choose the orientation of the working...
mzn [Wed, 28 Feb 2007 12:02:48 +0000 (12:02 +0000)]
Fix for PAL13459(EDF PAL 296 : Geom Sketcher Choose the orientation of the working plane).

17 years agoUpdate for OCC6.2
maintenance team [Wed, 28 Feb 2007 11:10:17 +0000 (11:10 +0000)]
Update for OCC6.2

17 years agoImplementation of PAL13455 (GEOM : PAL EDF 293 Selection filter).
rnv [Tue, 27 Feb 2007 07:04:38 +0000 (07:04 +0000)]
Implementation of PAL13455 (GEOM : PAL EDF 293 Selection filter).

17 years agoPAL 12719 : Add an arc constructor
nge [Fri, 23 Feb 2007 15:45:01 +0000 (15:45 +0000)]
PAL 12719 : Add an arc constructor

17 years agoPAL 12719 : Add an arc constructor
nge [Fri, 23 Feb 2007 14:16:34 +0000 (14:16 +0000)]
PAL 12719 : Add an arc constructor

17 years ago*** empty log message ***
nge [Fri, 23 Feb 2007 14:03:29 +0000 (14:03 +0000)]
*** empty log message ***

17 years agoPAL 12719 : Add an arc constructor
nge [Fri, 23 Feb 2007 13:59:25 +0000 (13:59 +0000)]
PAL 12719 : Add an arc constructor

17 years agoPAL 12719 : Add an Arc constructor
nge [Fri, 23 Feb 2007 13:50:22 +0000 (13:50 +0000)]
PAL 12719 : Add an Arc constructor

17 years agoPAL12874: Object Vector. Display a vector with arrow on its end.
jfa [Mon, 19 Feb 2007 11:53:46 +0000 (11:53 +0000)]
PAL12874: Object Vector. Display a vector with arrow on its end.

17 years agoPAL12874: Object Vector. Provide a possibility to display a vector with arrow on...
jfa [Mon, 19 Feb 2007 11:53:20 +0000 (11:53 +0000)]
PAL12874: Object Vector. Provide a possibility to display a vector with arrow on its end.

17 years agoFix for bug NPAL14907(EDF 368 : AddToStudy and GetName).
mzn [Fri, 16 Feb 2007 09:23:11 +0000 (09:23 +0000)]
Fix for bug NPAL14907(EDF 368 : AddToStudy and GetName).

17 years agoNPAL14883: Dump Python must use SubShapeAllSorted instead of SubShapeAll. The same...
jfa [Wed, 14 Feb 2007 13:20:26 +0000 (13:20 +0000)]
NPAL14883: Dump Python must use SubShapeAllSorted instead of SubShapeAll. The same for GUI.

17 years agoNPAL14828: Impossible to load a study created in batch mode. Use './' instead of... V3_2_5
jfa [Thu, 8 Feb 2007 11:22:58 +0000 (11:22 +0000)]
NPAL14828: Impossible to load a study created in batch mode. Use './' instead of empty path for OCCT correct work.

17 years agoChange version to 3.2.5 V3_2_5pre1
jfa [Thu, 1 Feb 2007 10:32:10 +0000 (10:32 +0000)]
Change version to 3.2.5

17 years agoNPAL14678: regression of GEOM_Object::getShape(). Return CORBA::LongLong instead...
jfa [Wed, 31 Jan 2007 09:58:03 +0000 (09:58 +0000)]
NPAL14678: regression of GEOM_Object::getShape(). Return CORBA::LongLong instead of CORBA::Long, because on 64-bits platforms address occupies 64 bits.

17 years agoNext version of partition.
skl [Tue, 30 Jan 2007 14:06:11 +0000 (14:06 +0000)]
Next version of partition.

17 years agoPAL13456 : change default values for Vertex Maker style and size.
amx [Mon, 29 Jan 2007 15:52:55 +0000 (15:52 +0000)]
PAL13456 : change default values for Vertex Maker style and size.

17 years agoMove docs of OCC viewer to GUI, following customer remarks.
jfa [Fri, 26 Jan 2007 14:49:17 +0000 (14:49 +0000)]
Move docs of OCC viewer to GUI, following customer remarks.

17 years agoPAL13456 : enlarge line width for sketcher preview only (1 pixel before, 2 now)
amx [Thu, 25 Jan 2007 08:37:21 +0000 (08:37 +0000)]
PAL13456 : enlarge line width for sketcher preview only (1 pixel before, 2 now)

17 years agoAdd two fields in the Geometry preference menu :
amx [Thu, 25 Jan 2007 08:33:25 +0000 (08:33 +0000)]
Add two fields in the Geometry preference menu :
- the type of the marker used to represent vertices.
- the size of the marker.

17 years agoNPAL14616: compatibility gcc4.1. Remove 'GEOMImpl_IShapesOperations::' from header.
jfa [Thu, 25 Jan 2007 08:06:44 +0000 (08:06 +0000)]
NPAL14616: compatibility gcc4.1. Remove 'GEOMImpl_IShapesOperations::' from header.

17 years agoFix for NPAL14147 : Remove a lot of trace at launching.
mkr [Tue, 23 Jan 2007 06:11:03 +0000 (06:11 +0000)]
Fix for NPAL14147 : Remove a lot of trace at launching.

17 years agoPAL13708: Complex geometry => Vertex creation very slow. Optimize sub-shapes publishi...
jfa [Fri, 12 Jan 2007 14:00:32 +0000 (14:00 +0000)]
PAL13708: Complex geometry => Vertex creation very slow. Optimize sub-shapes publishing in a Study.

17 years agoMPV NPAL13114: for OCCViewer we have to store not-displayed selected objects also...
mpv [Wed, 27 Dec 2006 07:52:02 +0000 (07:52 +0000)]
MPV NPAL13114: for OCCViewer we have to store not-displayed selected objects also. They are stored in mySelectedExternals field. It is filled in setSelected by not-displayed objects and it is appended to getSelected result list.

17 years agoAdd new idl function GEOM_IBooleanOperations::MakePartitionNonSelfIntersectedShape... NPAL14357 V3_2_4 V3_2_4_delivery V3_2_4pre2
jfa [Wed, 13 Dec 2006 09:40:11 +0000 (09:40 +0000)]
Add new idl function GEOM_IBooleanOperations::MakePartitionNonSelfIntersectedShape to provide correct publishing in study of a partition arguments and also to provide homogeneous behaviour of Partition in GUI and in python scripts.

17 years agoCorrect documentation style and pictures.
jfa [Tue, 12 Dec 2006 08:50:38 +0000 (08:50 +0000)]
Correct documentation style and pictures.

17 years agoPAL14122: GetInPlace failure. Provide correct treatment of compounds, shells and...
jfa [Mon, 11 Dec 2006 11:44:51 +0000 (11:44 +0000)]
PAL14122: GetInPlace failure. Provide correct treatment of compounds, shells and wires.

17 years agoPAL13703: addition to previous integration (see GEOM_Object.cxx, GEOM_Function.cxx...
jfa [Mon, 11 Dec 2006 10:29:28 +0000 (10:29 +0000)]
PAL13703: addition to previous integration (see GEOM_Object.cxx, GEOM_Function.cxx) to provide right treatment of groups

17 years agoPAL14122: EDF307: GetInPlace --> COMM_FAILURE. Use new method GEOMAlgo_BuilderShape...
jfa [Fri, 8 Dec 2006 15:40:42 +0000 (15:40 +0000)]
PAL14122: EDF307: GetInPlace --> COMM_FAILURE. Use new method GEOMAlgo_BuilderShape::ImagesResult() to obtain partition history.

17 years agoPAL14122: EDF307: GetInPlace --> COMM_FAILURE. A patch by PKV.
jfa [Fri, 8 Dec 2006 15:36:07 +0000 (15:36 +0000)]
PAL14122: EDF307: GetInPlace --> COMM_FAILURE. A patch by PKV.

17 years agoFixed problem: it's impossible to delete main object if its subshape have been used...
epa [Thu, 7 Dec 2006 11:42:23 +0000 (11:42 +0000)]
Fixed problem: it's impossible to delete main object if its subshape have been used for annother geometrical object creation

17 years agoAdd new command GetShapesOnBox. V3_2_4pre1
skl [Thu, 7 Dec 2006 10:42:47 +0000 (10:42 +0000)]
Add new command GetShapesOnBox.

17 years agoImprovements for gluing and new command GetShapesOnBox.
skl [Thu, 7 Dec 2006 10:39:45 +0000 (10:39 +0000)]
Improvements for gluing and new command GetShapesOnBox.

17 years agoPAL14122: EDF 307: GEOM: GetInPlace --> COMM_FAILURE. Prevent crash.
jfa [Wed, 6 Dec 2006 11:25:18 +0000 (11:25 +0000)]
PAL14122: EDF 307: GEOM: GetInPlace --> COMM_FAILURE. Prevent crash.

17 years agoMinor correction.
mzn [Mon, 4 Dec 2006 14:44:01 +0000 (14:44 +0000)]
Minor correction.

17 years agoChange version to 3.2.4
jfa [Mon, 4 Dec 2006 09:04:50 +0000 (09:04 +0000)]
Change version to 3.2.4

17 years agoFix for bug PAL14047(EDF PAL 334 : Problem to select merged face with Create group...
mzn [Fri, 1 Dec 2006 10:44:29 +0000 (10:44 +0000)]
Fix for bug PAL14047(EDF PAL 334 : Problem to select merged face with Create group window).

17 years agoUpdate documentation for PAL10048 ("Set Rotation Point" dialog - OCC 3D Viewer).
mkr [Wed, 29 Nov 2006 13:05:54 +0000 (13:05 +0000)]
Update documentation for PAL10048 ("Set Rotation Point" dialog - OCC 3D Viewer).

17 years agoFix for bug IPAL13981(imp PAL13619: Dump python fails on groups created in Mesh module).
mzn [Wed, 29 Nov 2006 11:02:42 +0000 (11:02 +0000)]
Fix for bug IPAL13981(imp PAL13619: Dump python fails on groups created in Mesh module).

17 years agoSRN: Added method GetSame that returns a subshape of the main shape equal to the...
srn [Mon, 27 Nov 2006 11:53:51 +0000 (11:53 +0000)]
SRN: Added method GetSame that returns a subshape of the main shape equal to the give shape

17 years agoSRN: Implemented method GetSame that seacrhes a shape equal to the given subshape...
srn [Mon, 27 Nov 2006 08:37:39 +0000 (08:37 +0000)]
SRN: Implemented method GetSame that seacrhes a shape equal to the given subshape in the main shape.

17 years agoSRN: Implemented method GetSame that seacrhes a shape equal to the given subshape...
srn [Mon, 27 Nov 2006 08:29:59 +0000 (08:29 +0000)]
SRN: Implemented method GetSame that seacrhes a shape equal to the given subshape in the main shape.

17 years agoFix for bug PAL13958(iso don't run (regressive bug)). V3_2_3_PkvImpr V3_2_3 V3_2_3pre4 V3_2_3pre5
mzn [Fri, 24 Nov 2006 13:52:20 +0000 (13:52 +0000)]
Fix for bug PAL13958(iso don't run (regressive bug)).

17 years agoImprovement of partition.
skl [Thu, 23 Nov 2006 13:44:54 +0000 (13:44 +0000)]
Improvement of partition.

17 years agoCorrected for new version of PartitionAlgo.
skl [Tue, 21 Nov 2006 12:54:22 +0000 (12:54 +0000)]
Corrected for new version of PartitionAlgo.

17 years agoFix method name V3_2_3pre2
jfa [Thu, 9 Nov 2006 14:22:20 +0000 (14:22 +0000)]
Fix method name

17 years agoUpdated for new method MakePartitionNonSelfIntersectedShape
jfa [Thu, 9 Nov 2006 14:21:33 +0000 (14:21 +0000)]
Updated for new method MakePartitionNonSelfIntersectedShape

17 years agoUpdate for new version of PartitionAlgo.
skl [Thu, 9 Nov 2006 13:59:01 +0000 (13:59 +0000)]
Update for new version of PartitionAlgo.

17 years agoUpdate documentation for Partition and RotationThreePnt.
jfa [Fri, 3 Nov 2006 13:41:01 +0000 (13:41 +0000)]
Update documentation for Partition and RotationThreePnt.

17 years agoPAL12612: Partition failed. Fix: set approximation parameter of boolean operation...
jfa [Fri, 3 Nov 2006 09:05:46 +0000 (09:05 +0000)]
PAL12612: Partition failed. Fix: set approximation parameter of boolean operation SECTION to 'true' to have smooth BSpline curves for new edges, where analytic curve is not possible.

17 years agoUpdate test for new version of PartitionAlgo.
skl [Fri, 3 Nov 2006 08:04:09 +0000 (08:04 +0000)]
Update test for new version of PartitionAlgo.

17 years agoUpdate test for new version of PartitionAlgo. V3_2_3pre1
skl [Thu, 2 Nov 2006 06:01:31 +0000 (06:01 +0000)]
Update test for new version of PartitionAlgo.

17 years agoNew version of PartitionAlgo.
skl [Thu, 2 Nov 2006 05:59:42 +0000 (05:59 +0000)]
New version of PartitionAlgo.

17 years agoFix for bug IPAL13750(View of icons in Construction by Extrusion is identical for...
mzn [Wed, 1 Nov 2006 14:50:15 +0000 (14:50 +0000)]
Fix for bug IPAL13750(View of icons in Construction by Extrusion is identical for different options: Vector or 2 Points).

17 years agoMistakes in operation of "Rotation" dialog box(free points mode) corrected
epa [Wed, 1 Nov 2006 12:27:51 +0000 (12:27 +0000)]
Mistakes in operation of "Rotation" dialog box(free points mode) corrected

17 years agoNew version of PartitionAlgo.
skl [Wed, 1 Nov 2006 08:02:49 +0000 (08:02 +0000)]
New version of PartitionAlgo.

17 years agoNew version of PartitionAlgo.
skl [Tue, 31 Oct 2006 13:56:22 +0000 (13:56 +0000)]
New version of PartitionAlgo.

17 years agoNew version of PartitionAlgo.
skl [Tue, 31 Oct 2006 13:47:09 +0000 (13:47 +0000)]
New version of PartitionAlgo.

17 years agoChange version to 3.2.3
jfa [Mon, 30 Oct 2006 14:52:35 +0000 (14:52 +0000)]
Change version to 3.2.3

17 years agoPAL 11107 - Make a rotation given an object and 3 points
epa [Fri, 27 Oct 2006 08:52:22 +0000 (08:52 +0000)]
PAL 11107 - Make a rotation given an object and 3 points

17 years agoPAL 11107 - Make a rotation given an object and 3 points
epa [Fri, 27 Oct 2006 08:39:40 +0000 (08:39 +0000)]
PAL 11107 - Make a rotation given an object and 3 points

17 years agoFix for IPAL13693(Execution of "GEOM_blocks.py" is failed).
mzn [Thu, 26 Oct 2006 09:11:54 +0000 (09:11 +0000)]
Fix for IPAL13693(Execution of "GEOM_blocks.py" is failed).

17 years agoCorrected by vsv for bug PAL13610.
skl [Wed, 25 Oct 2006 13:04:41 +0000 (13:04 +0000)]
Corrected by vsv for bug PAL13610.

17 years agoScripts update concerninig the smesh.py interface redesign.
mzn [Fri, 20 Oct 2006 12:04:02 +0000 (12:04 +0000)]
Scripts update concerninig the smesh.py interface redesign.

17 years agoProblem fixed: it's impossible to delete object which are used for another object...
maintenance team [Mon, 9 Oct 2006 07:07:32 +0000 (07:07 +0000)]
Problem fixed: it's impossible to delete object which are used for another object creation

17 years agoUse CORBA::string_dup instead of strdup to avoid memory problems. Suppress redundant...
jfa [Wed, 4 Oct 2006 15:20:32 +0000 (15:20 +0000)]
Use CORBA::string_dup instead of strdup to avoid memory problems. Suppress redundant string duplications.

17 years agoMPV: fix for nug IPAL13251
mpv [Tue, 3 Oct 2006 08:52:10 +0000 (08:52 +0000)]
MPV: fix for nug IPAL13251
"Mandriva64 porting: SIGSEGV during partition"

myDS->Shape and myDS->GetShape methods is very dangerous to use in the equations like the next:

const TopoDS_Face& aFace = TopoDS::Faces(myDS->Shape(anIndex));

because this reference can be invalid after the next command execution:

myDS->InsertShapeAndAncestorsSuccessors(...)

This command some times deletes old shapes from internal array to make bigger array.

17 years agoUpdate for gcc4.1
maintenance team [Fri, 29 Sep 2006 11:52:08 +0000 (11:52 +0000)]
Update for gcc4.1

17 years agoPAL10867: noexcepthandler option in GUI not working. Disable signals catching.
jfa [Thu, 28 Sep 2006 08:18:06 +0000 (08:18 +0000)]
PAL10867: noexcepthandler option in GUI not working. Disable signals catching.

17 years agoImplement improvement PAL13394: disk building from circle
rnv [Wed, 27 Sep 2006 11:17:03 +0000 (11:17 +0000)]
Implement improvement PAL13394: disk building from circle

17 years agoImplement improvement PAL9905: Incoherence in the GEOM API
rnv [Wed, 27 Sep 2006 11:04:58 +0000 (11:04 +0000)]
Implement improvement PAL9905: Incoherence in the GEOM API

17 years agoFix for bug 13476: Common of two compounds produce 10 compounds, 9 of which are empty.
jfa [Tue, 26 Sep 2006 11:35:38 +0000 (11:35 +0000)]
Fix for bug 13476: Common of two compounds produce 10 compounds, 9 of which are empty.

17 years agoUpdate for gcc 4.1.1
maintenance team [Tue, 26 Sep 2006 07:58:38 +0000 (07:58 +0000)]
Update for gcc 4.1.1

17 years agoFix for bug PAL13475(Wrong selection of objects after Display/Erase from Python conso...
mzn [Thu, 21 Sep 2006 13:16:53 +0000 (13:16 +0000)]
Fix for bug PAL13475(Wrong selection of objects after Display/Erase from Python console/module).

17 years agoBUG IPAL13407: Fixed
maintenance team [Wed, 20 Sep 2006 13:06:43 +0000 (13:06 +0000)]
BUG IPAL13407: Fixed

17 years agoPAL13412: EDF286: GEOM Sketcher: Apply is selected if we click on Y.
jfa [Tue, 19 Sep 2006 13:41:11 +0000 (13:41 +0000)]
PAL13412: EDF286: GEOM Sketcher: Apply is selected if we click on Y.

17 years agoUpdate spin-boxes step (in active dialogs) on change of corresponding preference.
jfa [Tue, 19 Sep 2006 13:38:56 +0000 (13:38 +0000)]
Update spin-boxes step (in active dialogs) on change of corresponding preference.

17 years agoPAL13411: EDF285: Error while importing ellipses.py. Fix regresion of Boolean operati...
jfa [Thu, 7 Sep 2006 08:59:04 +0000 (08:59 +0000)]
PAL13411: EDF285: Error while importing ellipses.py. Fix regresion of Boolean operations on case of non-3d arguments.

17 years agoPAL13375: batch with scripts based upon smesh.py and geompy.py. Init salome in geompy.py.
jfa [Thu, 7 Sep 2006 06:33:53 +0000 (06:33 +0000)]
PAL13375: batch with scripts based upon smesh.py and geompy.py. Init salome in geompy.py.

17 years agoBug PAL12904 (slow display with geompy). UpdateViewer() method implementation.
mzn [Tue, 5 Sep 2006 13:06:16 +0000 (13:06 +0000)]
Bug PAL12904 (slow display with geompy). UpdateViewer() method implementation.

17 years agoPAL13380 EDF PAL278 : line driver failed but OK via GUI. Error message precised. V3_2_2pre
jfa [Mon, 4 Sep 2006 12:24:10 +0000 (12:24 +0000)]
PAL13380 EDF PAL278 : line driver failed but OK via GUI. Error message precised.

17 years agoJoin modifications from branch BR_For_OCT_611: migration to OCCT6.1.1 with new except...
jfa [Mon, 4 Sep 2006 11:33:22 +0000 (11:33 +0000)]
Join modifications from branch BR_For_OCT_611: migration to OCCT6.1.1 with new exception handling and improved threads support.

17 years agoFix bug 13341: geompy.SubShapeAllSortedIDs() works wrong.
jfa [Thu, 31 Aug 2006 12:29:31 +0000 (12:29 +0000)]
Fix bug 13341: geompy.SubShapeAllSortedIDs() works wrong.

17 years agoReplace long name of TOC entry on a shorter one.
jfa [Thu, 31 Aug 2006 10:30:34 +0000 (10:30 +0000)]
Replace long name of TOC entry on a shorter one.

17 years agoPAL12470: Cannot use boolean operations on COMPOUNDs and COMPSOLIDs. Fix FUSE regression.
jfa [Wed, 30 Aug 2006 06:24:58 +0000 (06:24 +0000)]
PAL12470: Cannot use boolean operations on COMPOUNDs and COMPSOLIDs. Fix FUSE regression.

17 years agoPAL12470: Cannot use boolean operations on COMPOUNDs and COMPSOLIDs. Workaround OCCT...
jfa [Tue, 29 Aug 2006 14:57:56 +0000 (14:57 +0000)]
PAL12470: Cannot use boolean operations on COMPOUNDs and COMPSOLIDs. Workaround OCCT limitation, performing boolean operations on sub-shapes and then gathering results in a compound.

17 years agoImproved fix for bug PAL12858 (EDF210 GEOM Preferences menu of GEOM: color of the...
mzn [Tue, 29 Aug 2006 12:08:41 +0000 (12:08 +0000)]
Improved fix for bug  PAL12858 (EDF210 GEOM Preferences menu of GEOM: color of the wireframe?).

17 years agoCorrected for IPAL13224.
skl [Tue, 29 Aug 2006 12:07:54 +0000 (12:07 +0000)]
Corrected for IPAL13224.

17 years agoImproved fix for bug PAL12858 (EDF210 GEOM Preferences menu of GEOM: color of the...
mzn [Tue, 29 Aug 2006 12:04:48 +0000 (12:04 +0000)]
Improved fix for bug PAL12858 (EDF210 GEOM Preferences menu of GEOM: color of the wireframe?).

17 years agoCorrect ChangeOrientationShellCopy method to really make a copy of an object.
jfa [Mon, 28 Aug 2006 15:19:21 +0000 (15:19 +0000)]
Correct ChangeOrientationShellCopy method to really make a copy of an object.

17 years agoPAL13271 EDF258 GEOM: build of a box with 2 points: operation aborted
maintenance team [Mon, 28 Aug 2006 11:53:38 +0000 (11:53 +0000)]
PAL13271 EDF258 GEOM: build of a box with 2 points: operation aborted
GUI documentation has been updated

17 years agoFix for bug PAL12858(EDF210 GEOM Preferences menu of GEOM: color of the wireframe...
mzn [Fri, 25 Aug 2006 14:07:00 +0000 (14:07 +0000)]
Fix for bug PAL12858(EDF210 GEOM Preferences menu of GEOM: color of the wireframe?) Define the initial values for colors.

17 years agoFix for bug PAL12858(EDF210 GEOM Preferences menu of GEOM: color of the wireframe?)
mzn [Fri, 25 Aug 2006 14:05:16 +0000 (14:05 +0000)]
Fix for bug PAL12858(EDF210 GEOM Preferences menu of GEOM: color of the wireframe?)

17 years agoIntegration of improvements,proposed in PAL12405
akk [Fri, 25 Aug 2006 10:37:25 +0000 (10:37 +0000)]
Integration of improvements,proposed in PAL12405