]> SALOME platform Git repositories - modules/shaper.git/log
Salome HOME
modules/shaper.git
9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Mon, 6 Apr 2015 13:31:24 +0000 (16:31 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoActivate all commands when there is no selection
vsv [Mon, 6 Apr 2015 13:31:15 +0000 (16:31 +0300)]
Activate all commands when there is no selection

9 years agoDo not show Rigid symbol on external objects
vsv [Mon, 6 Apr 2015 13:30:39 +0000 (16:30 +0300)]
Do not show Rigid symbol on external objects

9 years agoFix the crash while removing lines with coincident points
azv [Mon, 6 Apr 2015 11:58:19 +0000 (14:58 +0300)]
Fix the crash while removing lines with coincident points

9 years agoFix for correct detaching of coincident points
azv [Mon, 6 Apr 2015 11:44:24 +0000 (14:44 +0300)]
Fix for correct detaching of coincident points

9 years agoFix for selection
vsv [Mon, 6 Apr 2015 09:30:38 +0000 (12:30 +0300)]
Fix for selection

9 years agoCorrect compilation errors
vsv [Mon, 6 Apr 2015 07:51:10 +0000 (10:51 +0300)]
Correct compilation errors

9 years agoIssue #434 Fix for equal cnstraint problem under Debian linux
sbh [Mon, 6 Apr 2015 07:37:08 +0000 (10:37 +0300)]
Issue #434 Fix for equal cnstraint problem under Debian linux

9 years agoCreate pop-up menu for lines detaching
vsv [Fri, 3 Apr 2015 16:44:42 +0000 (19:44 +0300)]
Create pop-up menu for lines detaching

9 years agoIssue #432: Don't show a fillet arc until the fillet is fully computed
azv [Fri, 3 Apr 2015 14:42:34 +0000 (17:42 +0300)]
Issue #432: Don't show a fillet arc until the fillet is fully computed

9 years agoIssue #424: Avoid conflicting constraint message.
azv [Fri, 3 Apr 2015 13:21:21 +0000 (16:21 +0300)]
Issue #424: Avoid conflicting constraint message.
Implemented correction for moving the mirror

9 years agoIssue #435: Fix initial positions of base entities of mirror constraint
azv [Fri, 3 Apr 2015 11:46:48 +0000 (14:46 +0300)]
Issue #435: Fix initial positions of base entities of mirror constraint

9 years agoIssue #434: Fix crash on line-arc equivalence
azv [Fri, 3 Apr 2015 09:14:38 +0000 (12:14 +0300)]
Issue #434: Fix crash on line-arc equivalence

9 years agoVerification of constraint attributes to be objects, not features
azv [Fri, 3 Apr 2015 08:36:06 +0000 (11:36 +0300)]
Verification of constraint attributes to be objects, not features

9 years agoClear remaining selection
vsv [Fri, 3 Apr 2015 08:49:26 +0000 (11:49 +0300)]
Clear remaining selection

9 years agoSet shaded shapes with edges
vsv [Fri, 3 Apr 2015 08:32:09 +0000 (11:32 +0300)]
Set shaded shapes with edges

9 years agoSet sketch constraint color for coincidence
vsv [Fri, 3 Apr 2015 08:15:47 +0000 (11:15 +0300)]
Set sketch constraint color for coincidence

9 years agomake compilable under debian linux
sbh [Fri, 3 Apr 2015 06:48:53 +0000 (09:48 +0300)]
make compilable under debian linux

9 years agoSketchSolver library refactoring
azv [Thu, 2 Apr 2015 05:44:56 +0000 (08:44 +0300)]
SketchSolver library refactoring

1. Implemented Fillet
2. Implemented Mirror constraint
3. Update Rigid constraint
4. Code clean up

9 years agoSketchSolver library refactoring
azv [Tue, 31 Mar 2015 15:54:47 +0000 (18:54 +0300)]
SketchSolver library refactoring

1. Implemented Radius constraint
2. Implemented Equal constraint
3. Implemented Tangent constraint

9 years agoSketchSolver library refactoring
azv [Tue, 31 Mar 2015 14:20:40 +0000 (17:20 +0300)]
SketchSolver library refactoring

1. Implemented distance and length constraints

9 years agoSketchSolver library refactoring
azv [Wed, 18 Mar 2015 05:26:37 +0000 (08:26 +0300)]
SketchSolver library refactoring

1. Implemented data storages and base constraint
2. Implemented coincidence and fixed constraints

9 years agoFix for back references not updated on abort of operation (sketch line abort)
mpv [Thu, 2 Apr 2015 16:17:15 +0000 (19:17 +0300)]
Fix for back references not updated on abort of operation (sketch line abort)

9 years agoFix for issue #431
mpv [Thu, 2 Apr 2015 15:33:38 +0000 (18:33 +0300)]
Fix for issue #431

9 years agoFix for issue #426
azv [Thu, 2 Apr 2015 15:13:03 +0000 (18:13 +0300)]
Fix for issue #426

9 years agoAvoid blinking on the Redo functionality
nds [Thu, 2 Apr 2015 14:34:10 +0000 (17:34 +0300)]
Avoid blinking on the Redo functionality

9 years agoThe bug about sketch sub-entities with constraints visualized after open a document.
nds [Thu, 2 Apr 2015 14:16:21 +0000 (17:16 +0300)]
The bug about sketch sub-entities with constraints visualized after open a document.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Thu, 2 Apr 2015 14:08:02 +0000 (17:08 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoThe bug about sketch sub-entities with constraints visualized after open a document.
nds [Thu, 2 Apr 2015 14:07:49 +0000 (17:07 +0300)]
The bug about sketch sub-entities with constraints visualized after open a document.

9 years agoImplemented possibility to update fillet radius
azv [Thu, 2 Apr 2015 13:45:56 +0000 (16:45 +0300)]
Implemented possibility to update fillet radius

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Thu, 2 Apr 2015 13:06:34 +0000 (16:06 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoSelection modes for constraint objects
vsv [Thu, 2 Apr 2015 13:06:19 +0000 (16:06 +0300)]
Selection modes for constraint objects

9 years agoIssue #422 - Application hangs up when apply Fillet constraint on preselected segments
nds [Thu, 2 Apr 2015 12:56:03 +0000 (15:56 +0300)]
Issue #422 - Application hangs up when apply Fillet constraint on preselected segments

Do not show an editor control if the mouse is out of the viewer. So, for creation a fillet by preselection, the double value control is active

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
mpv [Thu, 2 Apr 2015 12:28:54 +0000 (15:28 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoFixed the problem with fillet undo
mpv [Thu, 2 Apr 2015 12:28:27 +0000 (15:28 +0300)]
Fixed the problem with fillet undo

9 years agoMerge branch 'BR_DEBIAN_RUNTIME' of newgeom:newgeom.git into Dev_1.1.0
sbh [Thu, 2 Apr 2015 11:01:28 +0000 (14:01 +0300)]
Merge branch 'BR_DEBIAN_RUNTIME' of newgeom:newgeom.git into Dev_1.1.0

9 years agoExclude links to SketchPlugin
vsv [Thu, 2 Apr 2015 10:31:07 +0000 (13:31 +0300)]
Exclude links to SketchPlugin

9 years agoThe external edge should be removed only if it was created by the widget. So, the...
nds [Thu, 2 Apr 2015 08:48:18 +0000 (11:48 +0300)]
The external edge should be removed only if it was created by the widget. So, the functionality of an external object creation is separated into two - find and creation.

9 years agoFix for runtime error in libSketchSolver.so
sbh [Thu, 2 Apr 2015 07:49:13 +0000 (10:49 +0300)]
Fix for runtime error in libSketchSolver.so

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Thu, 2 Apr 2015 07:14:51 +0000 (10:14 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoFlush the redisplay signal by the document in remove feature; do not change the conce...
nds [Thu, 2 Apr 2015 07:14:38 +0000 (10:14 +0300)]
Flush the redisplay signal by the document in remove feature; do not change the concealed state during removeBackReference.

9 years agoUpdate tooltip of Equal constraint
azv [Thu, 2 Apr 2015 07:04:29 +0000 (10:04 +0300)]
Update tooltip of Equal constraint

9 years agoFix the problem with undoing fillet
azv [Thu, 2 Apr 2015 06:47:45 +0000 (09:47 +0300)]
Fix the problem with undoing fillet

9 years agoIssue #433: Mirror constraint problem
azv [Thu, 2 Apr 2015 06:24:09 +0000 (09:24 +0300)]
Issue #433: Mirror constraint problem

The empty items are removed from mirroring list

9 years agoIssue #422 - Application hangs up when apply Fillet constraint on preselected segments
nds [Thu, 2 Apr 2015 06:02:46 +0000 (09:02 +0300)]
Issue #422 - Application hangs up when apply Fillet constraint on preselected segments

The fillet radius value is not obligatory, the default value should be applyed for it by preselection.

9 years agoDisabled pieces of code which causes runtime error in libSketchSolver.so
sbh [Wed, 1 Apr 2015 17:09:32 +0000 (20:09 +0300)]
Disabled pieces of code which causes runtime error in libSketchSolver.so

undefined symbol: _ZTI18SketchPlugin_Point (./libSketchSolver.so)

9 years agoDisabled pieces of code which causes runtime error in libPartSet.so
sbh [Wed, 1 Apr 2015 16:57:02 +0000 (19:57 +0300)]
Disabled pieces of code which causes runtime error in libPartSet.so

undefined symbol: _ZTI17SketchPlugin_Line (through the libSketcherPrs.so)

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
nds [Wed, 1 Apr 2015 15:48:59 +0000 (18:48 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoIssue #427, 420 - crash during work through external edges.
nds [Wed, 1 Apr 2015 15:48:46 +0000 (18:48 +0300)]
Issue #427, 420 - crash during work through external edges.

It is necessary to add/remove back references during set an object to the attribute.
The external object should not be removed by widget if there is a feature, which already uses this object.
An additional check for the feature's data during analize the creation event from the model.

9 years agoAdjust validator of tangent constraint attributes for arc-arc tangency
azv [Wed, 1 Apr 2015 13:53:09 +0000 (16:53 +0300)]
Adjust validator of tangent constraint attributes for arc-arc tangency

9 years agoValidator for attributes of the Equal constraint
azv [Wed, 1 Apr 2015 12:56:05 +0000 (15:56 +0300)]
Validator for attributes of the Equal constraint

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Wed, 1 Apr 2015 11:44:43 +0000 (14:44 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoImprove sketcher popup menu processing
vsv [Wed, 1 Apr 2015 11:44:27 +0000 (14:44 +0300)]
Improve sketcher popup menu processing

9 years agoIssue #429: error when fix the same segment twice
azv [Wed, 1 Apr 2015 11:10:00 +0000 (14:10 +0300)]
Issue #429: error when fix the same segment twice

Implemented validator for the rigid constraint

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
sbh [Wed, 1 Apr 2015 10:13:23 +0000 (13:13 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoMake v1.1.0 compilable under linux
sbh [Wed, 1 Apr 2015 09:57:54 +0000 (12:57 +0300)]
Make v1.1.0 compilable under linux

9 years agoIssue #424: Mirror is done wrong
azv [Wed, 1 Apr 2015 09:40:16 +0000 (12:40 +0300)]
Issue #424: Mirror is done wrong

Additional verification of arcs in mirror constraint is implemented

9 years agoFix for the issue #370 : activization of updater only once per undo/redo for all...
mpv [Wed, 1 Apr 2015 09:34:40 +0000 (12:34 +0300)]
Fix for the issue #370 : activization of updater only once per undo/redo for all sub-documents

9 years agoExternal edge to be removed with all references. The same mechanizm should be applied...
nds [Wed, 1 Apr 2015 07:29:05 +0000 (10:29 +0300)]
External edge to be removed with all references. The same mechanizm should be applied like one used by the delete operation from the popup menu.

9 years agoCreate check box "Show constraints"
vsv [Tue, 31 Mar 2015 16:05:03 +0000 (19:05 +0300)]
Create check box "Show constraints"

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Tue, 31 Mar 2015 14:46:27 +0000 (17:46 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoFree memory on deletion of handle object
vsv [Tue, 31 Mar 2015 14:43:47 +0000 (17:43 +0300)]
Free memory on deletion of handle object

9 years agoAdditional check for shape selector: it is not necessary check validators if the...
nds [Tue, 31 Mar 2015 14:26:51 +0000 (17:26 +0300)]
Additional check for shape selector: it is not necessary check validators if the attribute could not be filled by the owner,

some conditions should be realized in the validators.

9 years agoPreselection of two points for distance operation.
nds [Tue, 31 Mar 2015 11:56:51 +0000 (14:56 +0300)]
Preselection of two points for distance operation.

The selected object is empty, so the first condition is not correct. All this checks should be done in the attribute validator.

9 years agoPreselection work correction to accept two lines for a parallel constraint.
nds [Tue, 31 Mar 2015 10:57:14 +0000 (13:57 +0300)]
Preselection work correction to accept two lines for a parallel constraint.

9 years agoBlock/unblock signal is emitted for plane creation to avoid the planes blinking befor...
nds [Tue, 31 Mar 2015 10:13:28 +0000 (13:13 +0300)]
Block/unblock signal is emitted for plane creation to avoid the planes blinking before they are hidden.

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

9 years ago1. The incorrect behaviour fixed:
nds [Tue, 31 Mar 2015 09:35:06 +0000 (12:35 +0300)]
1. The incorrect behaviour fixed:

Create a sketch(two circles), create an extrusion(use sketch in OB), edit sketch(create a new circle). The result is the extrusion is not redisplayed for the last circle.
2. Hide of the features from the initialization plugin after creation. There is a blinking in OCC viewer.
TODO: emit a signal about block/unblock the OCC viewer update to avoid this blinking.

9 years agoAdded objectByName method
mpv [Tue, 31 Mar 2015 07:11:14 +0000 (10:11 +0300)]
Added objectByName method

9 years agoSet dimensions arrows independent on zoom
vsv [Mon, 30 Mar 2015 14:01:04 +0000 (17:01 +0300)]
Set dimensions arrows independent on zoom

9 years agoResize symbols
vsv [Mon, 30 Mar 2015 08:21:44 +0000 (11:21 +0300)]
Resize symbols

9 years agoFix of problem with colors of result on undo-redo of result creation and color assign...
mpv [Mon, 30 Mar 2015 06:23:43 +0000 (09:23 +0300)]
Fix of problem with colors of result on undo-redo of result creation and color assignment.

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Fri, 27 Mar 2015 14:14:15 +0000 (17:14 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoCreate dimension presentations
vsv [Fri, 27 Mar 2015 14:14:07 +0000 (17:14 +0300)]
Create dimension presentations

9 years agoExternal edges correction for sketch operations.
nds [Fri, 27 Mar 2015 13:35:59 +0000 (16:35 +0300)]
External edges correction for sketch operations.

An external edge should be removed without any condition.

9 years agoExternal edges correction for sketch operations.
nds [Fri, 27 Mar 2015 11:46:38 +0000 (14:46 +0300)]
External edges correction for sketch operations.

9 years agoExternal edges correction for sketch operations.
nds [Fri, 27 Mar 2015 11:45:31 +0000 (14:45 +0300)]
External edges correction for sketch operations.

9 years agoMake Boolean operation tools hidden on apply of Boolean
mpv [Fri, 27 Mar 2015 08:36:55 +0000 (11:36 +0300)]
Make Boolean operation tools hidden on apply of Boolean

9 years agoIssue #393: Fix the problem with Distance between two separate fixed points
azv [Fri, 27 Mar 2015 08:06:17 +0000 (11:06 +0300)]
Issue #393: Fix the problem with Distance between two separate fixed points

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

9 years agoMake Mirror constraint visible in GUI
azv [Thu, 26 Mar 2015 13:14:20 +0000 (16:14 +0300)]
Make Mirror constraint visible in GUI

9 years agoFillet updated to create necessary constraints (tangent, coincidence etc) in data...
azv [Thu, 26 Mar 2015 12:08:51 +0000 (15:08 +0300)]
Fillet updated to create necessary constraints (tangent, coincidence etc) in data model

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

Conflicts:
src/SketchPlugin/SketchPlugin_Validators.cpp

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

Conflicts:
src/SketchPlugin/SketchPlugin_Validators.cpp

9 years agoValidators correction for merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
nds [Fri, 27 Mar 2015 07:27:47 +0000 (10:27 +0300)]
Validators correction for 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 [Thu, 26 Mar 2015 16:06:13 +0000 (19:06 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

9 years agoUpdate Config after merging with master
sbh [Thu, 26 Mar 2015 16:05:31 +0000 (19:05 +0300)]
Update Config after merging with master

9 years agoSameType object validator
vsv [Thu, 26 Mar 2015 14:12:58 +0000 (17:12 +0300)]
SameType object validator

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Thu, 26 Mar 2015 13:44:06 +0000 (16:44 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Validators.cpp

9 years agoValidator for tangent constraint
vsv [Thu, 26 Mar 2015 13:26:48 +0000 (16:26 +0300)]
Validator for tangent constraint

9 years agoMerge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
sbh [Thu, 26 Mar 2015 09:55:57 +0000 (12:55 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Plugin.cpp

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 agoMerge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
vsv [Thu, 26 Mar 2015 08:44:26 +0000 (11:44 +0300)]
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

9 years agoCreate coincidence constraint command
vsv [Thu, 26 Mar 2015 08:42:37 +0000 (11:42 +0300)]
Create coincidence constraint command

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

It renames the shape validator to the external validator.

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

Block for set initialized in order to compute distance value after isValid checking. isValid functionality changes the attribute content, but the isInitialized flag should not be modified

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