Salome HOME
modules/shaper.git
9 years agoMerge branch 'master' into Dev_1.1.0
sbh [Thu, 26 Mar 2015 09:55:05 +0000 (12:55 +0300)]
Merge branch 'master' into Dev_1.1.0

Conflicts:
CMakeLists.txt
src/Config/Config_FeatureReader.cpp
src/Config/Config_FeatureReader.h
src/ConstructionPlugin/ConstructionPlugin_Axis.cpp
src/ConstructionPlugin/ConstructionPlugin_Plane.cpp
src/ConstructionPlugin/ConstructionPlugin_Point.cpp
src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
src/FeaturesPlugin/Test/TestMultiBoolean.py
src/Model/Model_AttributeSelection.cpp
src/Model/Model_Update.cpp
src/ModelAPI/ModelAPI_RefAttrValidator.h
src/ModelAPI/ModelAPI_ShapeValidator.cpp
src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
src/PartSet/CMakeLists.txt
src/PartSet/PartSet_Validators.cpp
src/PartSet/PartSet_Validators.h
src/PartSet/PartSet_WidgetShapeSelector.cpp
src/SketchPlugin/CMakeLists.txt
src/SketchPlugin/SketchPlugin_Arc.cpp
src/SketchPlugin/SketchPlugin_Circle.cpp
src/SketchPlugin/SketchPlugin_ConstraintParallel.cpp
src/SketchPlugin/SketchPlugin_Line.cpp
src/SketchPlugin/SketchPlugin_Plugin.cpp
src/SketchPlugin/SketchPlugin_Point.cpp
src/SketchPlugin/SketchPlugin_Sketch.cpp
src/SketchPlugin/SketchPlugin_Validators.cpp
src/SketchPlugin/SketchPlugin_Validators.h
src/SketchPlugin/plugin-Sketch.xml

9 years agoUnion of validator and filter functionalities.
nds [Thu, 26 Mar 2015 05:03:17 +0000 (08:03 +0300)]
Union of validator and filter functionalities.

Code improvement, it renames storeAttributeValues to setObject.

9 years agoUnion of validator and filter functionalities.
nds [Thu, 26 Mar 2015 04:49:22 +0000 (07:49 +0300)]
Union of validator and filter functionalities.

External edge is visualized until another edge is selected of the filtered value is not valid
After merge from master, where a visualization bug is fixed, the edge should be erased from the viewer always in restoreAttributeValue.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
sbh [Wed, 25 Mar 2015 16:16:41 +0000 (19:16 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
sbh [Wed, 25 Mar 2015 16:16:15 +0000 (19:16 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

9 years agoThird party dependency for doxygen-graphviz added (libpng)
sbh [Wed, 25 Mar 2015 16:15:56 +0000 (19:15 +0300)]
Third party dependency for doxygen-graphviz added (libpng)

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Wed, 25 Mar 2015 16:14:07 +0000 (19:14 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoPut dimensions presentations on a layer 1
vsv [Wed, 25 Mar 2015 16:13:58 +0000 (19:13 +0300)]
Put dimensions presentations on a layer 1

9 years agoUnion of validator and filter functionalities.
nds [Wed, 25 Mar 2015 14:59:51 +0000 (17:59 +0300)]
Union of validator and filter functionalities.

External edges correction

9 years agoUnion of validator and filter functionalities.
nds [Wed, 25 Mar 2015 14:54:10 +0000 (17:54 +0300)]
Union of validator and filter functionalities.

Checking for edge is degenerated is performed inside attribute selection. Filters are not used anymore, but validators could not check the degenerated shape state because the attribute selection returns a compound shape for a degenerative edge set.

9 years agoMake the correct order in the searching of shape by name algorithm
mpv [Wed, 25 Mar 2015 13:44:14 +0000 (16:44 +0300)]
Make the correct order in the searching of shape by name algorithm

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Wed, 25 Mar 2015 13:24:25 +0000 (16:24 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoMake extrusion made on prism is modified after sketch update: regression fix
mpv [Wed, 25 Mar 2015 13:19:48 +0000 (16:19 +0300)]
Make extrusion made on prism is modified after sketch update: regression fix

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
mpv [Wed, 25 Mar 2015 12:20:55 +0000 (15:20 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoFix for extrusion and sketch relations.
mpv [Wed, 25 Mar 2015 12:20:30 +0000 (15:20 +0300)]
Fix for extrusion and sketch relations.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Wed, 25 Mar 2015 09:32:49 +0000 (12:32 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoUnion of validator and filter functionalities.
nds [Wed, 25 Mar 2015 09:32:35 +0000 (12:32 +0300)]
Union of validator and filter functionalities.

Checking for edge is degenerated is performed inside attribute selection. Filters are not used anymore, but validators could not check the degenerated shape state because the attribute selection returns a compound shape for a degenerative edge set.

9 years agoFix the problem of an arc moving
azv [Wed, 25 Mar 2015 09:15:26 +0000 (12:15 +0300)]
Fix the problem of an arc moving

9 years agoRolling back the merging problems
mpv [Wed, 25 Mar 2015 09:13:21 +0000 (12:13 +0300)]
Rolling back the merging problems

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
mpv [Wed, 25 Mar 2015 09:08:24 +0000 (12:08 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Sketch.cpp

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
mpv [Wed, 25 Mar 2015 09:06:35 +0000 (12:06 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
mpv [Wed, 25 Mar 2015 09:00:51 +0000 (12:00 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Sketch.cpp

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Wed, 25 Mar 2015 08:54:23 +0000 (11:54 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoModify icons
vsv [Wed, 25 Mar 2015 08:54:15 +0000 (11:54 +0300)]
Modify icons

9 years agoPlacement algorithm takes into account the orientation of the edges since now
azv [Wed, 25 Mar 2015 08:45:23 +0000 (11:45 +0300)]
Placement algorithm takes into account the orientation of the edges since now

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Wed, 25 Mar 2015 08:13:05 +0000 (11:13 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoUnion of validator and filter functionalities.
nds [Wed, 25 Mar 2015 08:12:49 +0000 (11:12 +0300)]
Union of validator and filter functionalities.

An attempt to remove external objects, created by moving over the line/edges from another sketch.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Wed, 25 Mar 2015 07:27:11 +0000 (10:27 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoAdd new object to the project
vsv [Wed, 25 Mar 2015 07:27:02 +0000 (10:27 +0300)]
Add new object to the project

9 years agoSupporting all types of objects (planes, lines, and points) as attributes of the...
azv [Wed, 25 Mar 2015 06:10:47 +0000 (09:10 +0300)]
Supporting all types of objects (planes, lines, and points) as attributes of the Placement feature

9 years agoUnion of validator and filter functionalities.
nds [Wed, 25 Mar 2015 05:02:14 +0000 (08:02 +0300)]
Union of validator and filter functionalities.

An attempt to remove external objects, created by moving over the line/edges from another sketch.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Wed, 25 Mar 2015 04:35:41 +0000 (07:35 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoProvide zoom independent selection of symbols
vsv [Tue, 24 Mar 2015 15:45:50 +0000 (18:45 +0300)]
Provide zoom independent selection of symbols

9 years agoUpdate the version number in SALOME module too V_1.0.2
mpv [Tue, 24 Mar 2015 14:39:02 +0000 (17:39 +0300)]
Update the version number in SALOME module too

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Tue, 24 Mar 2015 14:10:48 +0000 (17:10 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoUnion of validator and filter functionalities.
nds [Tue, 24 Mar 2015 14:10:28 +0000 (17:10 +0300)]
Union of validator and filter functionalities.

Widget sketch label is improved to use the planar face validator.

9 years agoUpdate the doxygen documentation
mpv [Tue, 24 Mar 2015 13:32:39 +0000 (16:32 +0300)]
Update the doxygen documentation

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Tue, 24 Mar 2015 12:38:09 +0000 (15:38 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoRemove DirY from Sketch attributes
azv [Tue, 24 Mar 2015 11:26:30 +0000 (14:26 +0300)]
Remove DirY from Sketch attributes

9 years agoUpdate Placement feature with flags Reverse and Centering
azv [Tue, 24 Mar 2015 09:56:46 +0000 (12:56 +0300)]
Update Placement feature with flags Reverse and Centering

9 years agoFix for issue #417
mpv [Tue, 24 Mar 2015 09:21:33 +0000 (12:21 +0300)]
Fix for issue #417

9 years agoFix of crash in issue #416
mpv [Tue, 24 Mar 2015 09:21:01 +0000 (12:21 +0300)]
Fix of crash in issue #416

9 years agoPreparation of a new version
mpv [Tue, 24 Mar 2015 08:44:31 +0000 (11:44 +0300)]
Preparation of a new version

9 years agoFix for random order of faces in selection name (groups on extrusion after aborting).
mpv [Tue, 24 Mar 2015 07:54:26 +0000 (10:54 +0300)]
Fix for random order of faces in selection name (groups on extrusion after aborting).

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Tue, 24 Mar 2015 05:39:16 +0000 (08:39 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoUnion of validator and filter functionalities.
nds [Tue, 24 Mar 2015 05:39:01 +0000 (08:39 +0300)]
Union of validator and filter functionalities.

The attribute type should be stored through the standard way. Just selection is processed on selection changed.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
sbh [Mon, 23 Mar 2015 15:11:06 +0000 (18:11 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

9 years agoParameters plugin created
sbh [Mon, 23 Mar 2015 15:10:46 +0000 (18:10 +0300)]
Parameters plugin created

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Mon, 23 Mar 2015 13:05:48 +0000 (16:05 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoCorrection of icon
vsv [Mon, 23 Mar 2015 13:05:34 +0000 (16:05 +0300)]
Correction of icon

9 years agoUnion of validator and filter functionalities.
nds [Mon, 23 Mar 2015 12:57:03 +0000 (15:57 +0300)]
Union of validator and filter functionalities.

This is moving of ModuleBase validators to the GeomValidator project

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Mon, 23 Mar 2015 12:52:52 +0000 (15:52 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoMake symbols of constraints with fixed distance
vsv [Mon, 23 Mar 2015 12:52:34 +0000 (15:52 +0300)]
Make symbols of constraints with fixed distance

9 years agoUnion of validator and filter functionalities.
nds [Mon, 23 Mar 2015 10:54:42 +0000 (13:54 +0300)]
Union of validator and filter functionalities.

It replaces ResultValidator to AttributeValidator in order to have a similar interface for most of validators.

9 years agoMerge remote-tracking branch 'origin/Dev_1.1.0' into Dev_1.1.0
mpv [Mon, 23 Mar 2015 09:02:28 +0000 (12:02 +0300)]
Merge remote-tracking branch 'origin/Dev_1.1.0' into Dev_1.1.0

9 years agoUsage of constraint result functions instead of the builder
mpv [Mon, 23 Mar 2015 08:57:19 +0000 (11:57 +0300)]
Usage of constraint result functions instead of the builder

9 years agoCorrections for linux platform
sbh [Mon, 23 Mar 2015 08:39:04 +0000 (11:39 +0300)]
Corrections for linux platform

9 years agoProcess validators on the first feature's creation using the Config_ValidatorReader
sbh [Mon, 23 Mar 2015 08:07:32 +0000 (11:07 +0300)]
Process validators on the first feature's creation using the Config_ValidatorReader

9 years agoUnion of validator and filter functionalities.
nds [Mon, 23 Mar 2015 05:40:42 +0000 (08:40 +0300)]
Union of validator and filter functionalities.

Validators using for the multi-selection control. It uses the cashed objects mySeleciton for isValid functionality.
The cash between onSelectionChanged and storeCustom is not used anumore.

9 years agoCode improvement: it removes the obsolete commented code to do not give the shape...
nds [Fri, 20 Mar 2015 16:18:49 +0000 (19:18 +0300)]
Code improvement: it removes the obsolete commented code to do not give the shape if the result has the same shape.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Fri, 20 Mar 2015 14:58:31 +0000 (17:58 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoUnion of validator and filter functionalities.
nds [Fri, 20 Mar 2015 14:57:28 +0000 (17:57 +0300)]
Union of validator and filter functionalities.

Validator for NoConstructionSubShape filter

9 years agoFix for stable processing of mirror constraint (eliminating SolveSpace problems)
azv [Fri, 20 Mar 2015 14:12:38 +0000 (17:12 +0300)]
Fix for stable processing of mirror constraint (eliminating SolveSpace problems)

9 years agoUnion of validator and filter functionalities.
nds [Fri, 20 Mar 2015 13:31:19 +0000 (16:31 +0300)]
Union of validator and filter functionalities.

Update object by selection change

9 years agoUnion of validator and filter functionalities.
nds [Fri, 20 Mar 2015 12:31:45 +0000 (15:31 +0300)]
Union of validator and filter functionalities.

FaceFilter is replaced on ModuleBase_ValidatorFace

9 years agoConstruction bug fix: the current operation should not be aborted on the popup menu...
nds [Fri, 20 Mar 2015 09:42:54 +0000 (12:42 +0300)]
Construction bug fix: the current operation should not be aborted on the popup menu build.

9 years agoConstruction bug fix: the current operation should not be aborted on the popup menu...
nds [Fri, 20 Mar 2015 09:38:54 +0000 (12:38 +0300)]
Construction bug fix: the current operation should not be aborted on the popup menu build.

9 years agoIssue #412: Crash on delete sketch line with constraints
azv [Fri, 20 Mar 2015 08:23:12 +0000 (11:23 +0300)]
Issue #412: Crash on delete sketch line with constraints

Avoid removing from the sketch all points used in coincidence constraint

9 years agoVerification the sketch data is not empty
azv [Fri, 20 Mar 2015 07:52:57 +0000 (10:52 +0300)]
Verification the sketch data is not empty

9 years agoFix the deletion events problems
mpv [Fri, 20 Mar 2015 07:49:07 +0000 (10:49 +0300)]
Fix the deletion events problems

9 years agoUnion of validator and filter functionalities.
nds [Fri, 20 Mar 2015 07:47:39 +0000 (10:47 +0300)]
Union of validator and filter functionalities.

Code improvement.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Fri, 20 Mar 2015 07:35:03 +0000 (10:35 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoUnion of validator and filter functionalities.
nds [Fri, 20 Mar 2015 07:34:55 +0000 (10:34 +0300)]
Union of validator and filter functionalities.

EdgeFilter and MultiFilter use is replaced by validator.

9 years agoFillet constraint is implemented.
azv [Fri, 20 Mar 2015 07:10:10 +0000 (10:10 +0300)]
Fillet constraint is implemented.
Small changes according Mirror constraint were made.

9 years agoSet default value for case id attribute of Paged Containers (like Toolbox)
sbh [Thu, 19 Mar 2015 16:42:05 +0000 (19:42 +0300)]
Set default value for case id attribute of Paged Containers (like Toolbox)

9 years agoMinor corrections
mpv [Thu, 19 Mar 2015 13:57:15 +0000 (16:57 +0300)]
Minor corrections

9 years agoMake preview of python Box feature working correctly
mpv [Thu, 19 Mar 2015 09:46:34 +0000 (12:46 +0300)]
Make preview of python Box feature working correctly

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Thu, 19 Mar 2015 09:29:08 +0000 (12:29 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoUnion of validator and filter functionalities.
nds [Thu, 19 Mar 2015 09:28:50 +0000 (12:28 +0300)]
Union of validator and filter functionalities.

The selection is obtained from the entity owner instead of getting it from the viewer context.

9 years agoMake selection of results as arguments of extrusion working correctly
mpv [Thu, 19 Mar 2015 08:04:29 +0000 (11:04 +0300)]
Make selection of results as arguments of extrusion working correctly

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Thu, 19 Mar 2015 07:11:24 +0000 (10:11 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoSketch selection in the browser for extrusion operation
nds [Thu, 19 Mar 2015 05:42:08 +0000 (08:42 +0300)]
Sketch selection in the browser for extrusion operation

An empty shape for the sketch result

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
sbh [Wed, 18 Mar 2015 16:59:56 +0000 (19:59 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

9 years agoCode documentation and formating for initialization plugin
sbh [Wed, 18 Mar 2015 16:59:40 +0000 (19:59 +0300)]
Code documentation and formating for initialization plugin

9 years agoTangent presentation correction
vsv [Wed, 18 Mar 2015 16:09:28 +0000 (19:09 +0300)]
Tangent presentation correction

9 years agoMerge branch 'master' of newgeom:newgeom.git
sbh [Wed, 18 Mar 2015 14:12:16 +0000 (17:12 +0300)]
Merge branch 'master' of newgeom:newgeom.git

9 years agoImplementation of Box python feature as a Composite feature again
sbh [Wed, 18 Mar 2015 14:11:56 +0000 (17:11 +0300)]
Implementation of Box python feature as a Composite feature again

9 years agoAvoid problems with mirror constraint
azv [Wed, 18 Mar 2015 13:01:47 +0000 (16:01 +0300)]
Avoid problems with mirror constraint

9 years agoFix by MPV
azv [Wed, 18 Mar 2015 12:14:40 +0000 (15:14 +0300)]
Fix by MPV

9 years agoImplemented processing of Mirror constraint by sketch solver
azv [Wed, 18 Mar 2015 07:36:20 +0000 (10:36 +0300)]
Implemented processing of Mirror constraint by sketch solver
Test case added

9 years agoImplemented feature for constraint Mirror
azv [Wed, 18 Mar 2015 04:12:43 +0000 (07:12 +0300)]
Implemented feature for constraint Mirror

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Wed, 18 Mar 2015 11:54:06 +0000 (14:54 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoSketch selection in the browser for extrusion operation
nds [Wed, 18 Mar 2015 11:53:52 +0000 (14:53 +0300)]
Sketch selection in the browser for extrusion operation

An empty shape for the sketch result

9 years agoImplementation of "copyTo" method for data
mpv [Wed, 18 Mar 2015 11:46:16 +0000 (14:46 +0300)]
Implementation of "copyTo" method for data

9 years agoSketch selection in the browser for extrusion operation
nds [Wed, 18 Mar 2015 11:34:25 +0000 (14:34 +0300)]
Sketch selection in the browser for extrusion operation

An empty shape for the sketch result

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Wed, 18 Mar 2015 11:13:17 +0000 (14:13 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoMulti-selection widget to be used in the extrusion feature.
nds [Wed, 18 Mar 2015 11:09:12 +0000 (14:09 +0300)]
Multi-selection widget to be used in the extrusion feature.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Wed, 18 Mar 2015 08:10:00 +0000 (11:10 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoMulti-selection widget to be used in the extrusion feature.
nds [Wed, 18 Mar 2015 08:09:45 +0000 (11:09 +0300)]
Multi-selection widget to be used in the extrusion feature.

Shape validator correction

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
mpv [Wed, 18 Mar 2015 07:38:50 +0000 (10:38 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0