fixes 0003819: no proper input for contact stiffness

FreeCAD · Feb 22, 2019 · b9b0a97 · b9b0a97
1 parent f6d9ec8
commit b9b0a97
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
@@ -424,10 +424,15 @@ const std::string TaskFemConstraintContact::getReferences() const
 }
 
 /* Note: */
-double TaskFemConstraintContact::get_Slope() const{return ui->spSlope->value();}
-double TaskFemConstraintContact::get_Friction() const{return ui->spFriction->value();}
-
+double TaskFemConstraintContact::get_Slope() const
+{
+    return ui->spSlope->rawValue();
+}
 
+double TaskFemConstraintContact::get_Friction() const
+{
+    return ui->spFriction->value();
+}
 
 void TaskFemConstraintContact::changeEvent(QEvent *)
 {

diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.ui b/src/Mod/Fem/Gui/TaskFemConstraintContact.ui
@@ -117,10 +117,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QDoubleSpinBox" name="spSlope">
-       <property name="decimals">
-        <number>2</number>
-       </property>
+      <widget class="Gui::InputField" name="spSlope">
        <property name="maximum">
         <double>1000000000.000000000000000</double>
        </property>
@@ -130,6 +127,9 @@
        <property name="value">
         <double>1000000.000000000000000</double>
        </property>
+       <property name="unit" stdset="0">
+        <string notr="true">Pa</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -164,6 +164,13 @@
   <zorder>lw_referencesMaster</zorder>
   <zorder>lbl_info_2</zorder>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Gui::InputField</class>
+   <extends>QLineEdit</extends>
+   <header>Gui/InputField.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>