Issue #1658 New widget supporting nested option buttons : icons size corection (to...

diff --git a/src/ConstructionPlugin/icons/plane_by_coincident_to_point_24x24.png b/src/ConstructionPlugin/icons/plane_by_coincident_to_point_24x24.png
new file mode 100755 (executable)
index 0000000..13896b3
Binary files /dev/null and b/src/ConstructionPlugin/icons/plane_by_coincident_to_point_24x24.png differ

diff --git a/src/ConstructionPlugin/icons/plane_by_distance_from_other_24x24.png b/src/ConstructionPlugin/icons/plane_by_distance_from_other_24x24.png
new file mode 100755 (executable)
index 0000000..33fef45
Binary files /dev/null and b/src/ConstructionPlugin/icons/plane_by_distance_from_other_24x24.png differ

diff --git a/src/ConstructionPlugin/icons/plane_by_rotation_24x24.png b/src/ConstructionPlugin/icons/plane_by_rotation_24x24.png
new file mode 100755 (executable)
index 0000000..5a95ef6
Binary files /dev/null and b/src/ConstructionPlugin/icons/plane_by_rotation_24x24.png differ

diff --git a/src/ConstructionPlugin/plane_widget.xml b/src/ConstructionPlugin/plane_widget.xml
index 9085e2c76433710a23dfde5bc75a05b080c6d166..be03113605cd8d830ed27dc4865f25cd9037afa0 100644 (file)
--- a/src/ConstructionPlugin/plane_widget.xml
+++ b/src/ConstructionPlugin/plane_widget.xml
@@ -63,7 +63,7 @@
         <box id="by_distance_from_other"
              title="By distance from other"
              tooltip="Plane by distance from other plane."
-             icon="icons/Construction/plane_by_distance_from_other_32x32.png">
+             icon="icons/Construction/plane_by_distance_from_other_24x24.png">
           <doublevalue id="distance"
                        label="Distance"
                        tooltip="Distance from selected face to plane."
@@ -77,7 +77,7 @@
         <box id="by_coincident_to_point"
              title="By coincident to point"
              tooltip="Plane by coincident to point."
-             icon="icons/Construction/plane_by_coincident_to_point_32x32.png">
+             icon="icons/Construction/plane_by_coincident_to_point_24x24.png">
           <shape_selector id="coincident_point"
                           label="Point"
                           tooltip="Select point."
@@ -88,7 +88,7 @@
         <box id="by_rotation"
              title="By rotation"
              tooltip="Plane by rotation around axis."
-             icon="icons/Construction/plane_by_rotation_32x32.png">
+             icon="icons/Construction/plane_by_rotation_24x24.png">
           <shape_selector id="axis"
                           label="Axis"
                           tooltip="Select line for axis."

diff --git a/src/InitializationPlugin/InitializationPlugin_Plugin.cpp b/src/InitializationPlugin/InitializationPlugin_Plugin.cpp
index c03eb38d1061a12cab0ef184663db345d92c0feb..5317f7d7ea833d3e0a1ffbf0c902c6d14bb6ddaf 100644 (file)
--- a/src/InitializationPlugin/InitializationPlugin_Plugin.cpp
+++ b/src/InitializationPlugin/InitializationPlugin_Plugin.cpp
@@ -16,8 +16,6 @@
 
 #include <memory>
 
-#define NESTED_WIDGETS_FIX
-
 // the only created instance of this plugin
 static InitializationPlugin_Plugin* MY_INITIALIZATIONPLUGIN_INSTANCE =
     new InitializationPlugin_Plugin();
@@ -93,10 +91,6 @@ FeaturePtr InitializationPlugin_Plugin::createPlane(DocumentPtr theDoc, double t
 {
   FeaturePtr aPlane = theDoc->addFeature("Plane");
   aPlane->string("creation_method")->setValue("by_general_equation");
-#ifdef NESTED_WIDGETS_FIX
-  aPlane->string("by_other_plane_option")->setValue("by_distance_from_other");
-  aPlane->real("distance")->setValue(0);
-#endif
   aPlane->real("A")->setValue(theX);
   aPlane->real("B")->setValue(theY);
   aPlane->real("C")->setValue(theZ);
@@ -155,15 +149,6 @@ FeaturePtr InitializationPlugin_Plugin::createAxis(DocumentPtr theDoc, FeaturePt
   aAxis->real("Y_Direction")->setValue(theY);
   aAxis->real("Z_Direction")->setValue(theZ);
 
-#ifdef NESTED_WIDGETS_FIX
-  aAxis->string("use_offset1")->setValue("");
-  aAxis->real("offset1")->setValue(0);
-  aAxis->boolean("reverse_offset1")->setValue(false);
-  aAxis->string("use_offset2")->setValue("");
-  aAxis->real("offset2")->setValue(0);
-  aAxis->boolean("reverse_offset2")->setValue(false);
-#endif
-
   if (theX != 0) {
     aAxis->data()->setName("OX");
   } else if (theY != 0) {