From: sbh <sergey.belash@opencascade.com>
Date: Thu, 3 Apr 2014 14:35:05 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.1~41
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=24fd5aa4e000a03e484c5d4c544e5e08b08a747f;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git
---

24fd5aa4e000a03e484c5d4c544e5e08b08a747f
diff --cc src/Config/plugin-PartSet.xml
index fff9a54aa,2b4e76e22..76c67c75c
--- a/src/Config/plugin-PartSet.xml
+++ b/src/Config/plugin-PartSet.xml
@@@ -8,13 -8,13 +8,13 @@@
    </workbench>
    <workbench id="Construction">
      <group id="Basic">
-       <feature id="new_point" text="Point" tooltip="Create a new point" icon=":icons/point.png">
+       <feature id="Point" text="Point" tooltip="Create a new point" icon=":icons/point.png">
          <value id="x" type="double" label="X:" min="0" max="" step="0.1" default="0"/>
 -        <value id="y" type="double" label="Y:" min="0" max="" step="0.1" default="0"/>
 -        <value id="z" type="double" label="Z:" min="0" max="" step="0.1" default="0"/>
 +        <value id="y" type="double" label="Y:" min="0" max="" step="0.1" default="1"/>
 +        <value id="z" type="double" label="Z:" min="0" max="10" step="0.1" default="2"/>
        </feature>
-       <feature id="new_axis" text="Axis" tooltip="Create a new axis" icon=":icons/axis.png" keysequence=""/>
-       <feature id="new_plane" text="Plane" tooltip="Create a new plane" icon=":icons/plane.png" keysequence=""/>
+       <feature id="Axis" text="Axis" tooltip="Create a new axis" icon=":icons/axis.png" keysequence=""/>
+       <feature id="Plane" text="Plane" tooltip="Create a new plane" icon=":icons/plane.png" keysequence=""/>
      </group>
    </workbench>  
- </plugin>
+ </plugin>
diff --cc src/Model/Model_PluginManager.cxx
index daeb60176,15b85a9b1..ce53ba069
--- a/src/Model/Model_PluginManager.cxx
+++ b/src/Model/Model_PluginManager.cxx
@@@ -36,10 -58,9 +58,10 @@@ void Model_PluginManager::setCurrentDoc
  Model_PluginManager::Model_PluginManager()
  {
    myPluginsInfoLoaded = false;
 -  static Event_ID aFeatureEvent = Event_Loop::eventByName("RegisterFeature");
 +  //TODO(sbh): Implement static method to extract event id [SEID]
 +  static Event_ID aFeatureEvent = Event_Loop::eventByName("FeatureEvent");
  
-   ModelAPI_PluginManager::SetPluginManager(boost::shared_ptr<ModelAPI_PluginManager>(this));
+   ModelAPI_PluginManager::SetPluginManager(std::shared_ptr<ModelAPI_PluginManager>(this));
    // register the configuration reading listener
    Event_Loop* aLoop = Event_Loop::loop();
    aLoop->registerListener(this, aFeatureEvent);