Commit Graph

52 Commits

Author SHA1 Message Date
Przemo Firszt
461e506c41 FEM: Add command only when GUI is up
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-07-29 10:58:19 -03:00
Przemo Firszt
6de28c158d FEM: fix white space
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-06-09 13:07:49 -03:00
Przemo Firszt
b507505a47 FEM: Fix crash on missing unit when editing material second time
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-05-18 17:09:30 +01:00
Przemo Firszt
ab26d7fd50 FEM: Replace invalid General_description with Description
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-27 21:33:17 +02:00
Przemo Firszt
b61bb54b78 FEM: General_name is invalid since f96f319986
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-27 21:33:14 +02:00
Przemo Firszt
42bc0b57f8 FEM: Remove never used saveMat function
That function won't be used as there is a plan to merge material
handling with Arch wb and Arch wb already has material editor.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-27 21:33:09 +02:00
Przemo Firszt
c6d1052f1f FEM: Force showing Youngs modulus in MPa
That commit fixes inconsistent behaviour of Young's modulus input field
units in FEM material dialog window.

Reported-by: sgrogan
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-27 21:33:08 +02:00
Przemo Firszt
e6d7b7e586 FEM: Change Mechanical Material shortcut to M, M
Suggested by wmayer

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-23 17:04:50 +02:00
Przemo Firszt
f96f319986 FEM: Change default behaviour of ConfigParser used for materials
ConfigParser changes option capital letters in keys to small letters.
That commit changes it to generate verbatim keys as read from FCMat
files. Also Section names are no longer used to generate material
dictionary.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-23 17:01:18 +02:00
Przemo Firszt
ac5fe442dc FEM: Group all helper functions together
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
b6ea746fa2 FEM: Rename chooseMat to choose_material
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
3066e6b3d0 FEM: Use built-in None material if there was no previous material
Adding material was using by default transient None material that
has no properties assigned. If use accepted that type of material
an attempt to write CalculiX input file was ending up with a crash.
Using built-in None material prevents that situation.

Reported-by: wmayer
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
6437beaec1 FEM: Use default True value for material dirs
Defaulting to False was causing problems during migration. The default
checkbox of linked FEM preferences is True, but for the first time users
there was nothing stored in UseBuiltInMaterials, UseMaterialsFromConfigDir
and UseMaterialsFromCustomDir, so the materials were not showing up in
the material ComboBox.

Reported-by: wmayer
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
663771f0a4 FEM: Sort materials within each category
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
84467808a4 FEM: Use get_material_data in print_mat_data function
get_material_name provides material name in a safe way, so there is
no need to check in General_name exists in material definition

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:46 +02:00
Przemo Firszt
9eb6cf7480 FEM: Clean code to remove space-after-comma flake8 warning
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:45 +02:00
Przemo Firszt
abefd40bb7 FEM: Add Preferences option to hide materials from user defined directory
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:45 +02:00
Przemo Firszt
1d5b4709fe FEM: Add Preferences option to hide materials from .FreeCAD/Materials directory
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:44 +02:00
Przemo Firszt
32a51db481 FEM: Add Preferences option to hide built in materials
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:43 +02:00
Przemo Firszt
956e5f0da0 FEM: Remove self.params
It doesn't make sense to pull preferences in __init__ for later use as
they change dependin on user action.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:43 +02:00
Przemo Firszt
5040266320 FEM: Add message about reverting material after user clicked Cancel button
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:42 +02:00
Przemo Firszt
9205db4b77 FEM: Fix problem with lost values after editing material properties
Now a valid value is stored immediately into object material.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:41 +02:00
Przemo Firszt
75fcae04b9 FEM: Compare material using all properies and handle non-local materials
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:41 +02:00
Przemo Firszt
c091b87459 FEM: Rename comboBox_MaterialsInDir to cb_materials
The combo box no longer stores materials from just one dir, so name
needs to be changed

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:40 +02:00
Przemo Firszt
8113463e1e FEM: Import all materials in init instead of on-demand import
On-demand import is no longer good enough as we have 3 different
material directories and materials may have non-unique names.
A material is now identified by a full file path.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:39 +02:00
Przemo Firszt
343225dcc2 FEM: Show material description below combo box
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:39 +02:00
Przemo Firszt
97f5f76433 FEM: Add function for adding materiales from a directory
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:38 +02:00
Przemo Firszt
7cb4df59f7 FEM: Use chooseMat directly set set initial value for material
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:37 +02:00
Przemo Firszt
9a9f7e64a5 FEM: Add icons to materials
Add icons to distinguish where the material is from. FreeCAD icon for
build-in materials, notmal material icon for materials from user
preferences directory which is "~/.FreeCAD/Materials" on linux or
from an user defined location defined in FEM preferences.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:36 +02:00
Przemo Firszt
f7fd04aa2b FEM: Add option to define custom material directory
That commit also tidies up FEM preferences, so all file
choosers have the same width

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:36 +02:00
Przemo Firszt
0039ea9e72 FEM: Rename dirname to sytem_mat_dir
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:35 +02:00
Przemo Firszt
54ae984650 FEM: Read materials from user settings directory
That commit also adds python function getUserAppDataDir that calls
Application::getUserAppDataDir()

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:34 +02:00
Przemo Firszt
54bb4e297e FEM: Add "None" and simplify material setting
The "-->choose Material" has been replaced with a not defined material.
That makes setting/retrieving material to/from the object much easier
and allows user to have a "not defined" material. Previously it wasn't
possible to change i.e. form Steel to "not defined".

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:06 +02:00
Przemo Firszt
aec082639f FEM: Clean unused import in MechanicalMaterial.py
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:06 +02:00
Przemo Firszt
65396bc95b FEM: Comment out not yet used saveMat function 2015-04-09 19:45:05 +02:00
Przemo Firszt
18aad09d0d FEM: Replace spinBox_young_modulus with input_fd_young_modulus
spinBox_young_modulus variable is not Gui::SpinBox, but Gui::InputField

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:05 +02:00
Przemo Firszt
56bf10afef FEM: Replace duplicated code with print_mat_data function
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:04 +02:00
Przemo Firszt
8de8b991a5 FEM: Replace deprecated has_key with in
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:04 +02:00
Przemo Firszt
135cfbd80f FEM: Remove unused local variable
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:03 +02:00
Przemo Firszt
157a1d8e77 FEM: Fix spaces around =/+/: and brackets
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:03 +02:00
Przemo Firszt
5a1249dc3b FEM: Fix white space errors
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:02 +02:00
Przemo Firszt
6bfd683dcf FEM: Clean unused imports in MechanicalMaterial.py
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:02 +02:00
Przemo Firszt
1ff82e48c6 FEM: Fix copyright date
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-09 19:45:01 +02:00
wmayer
176f3e6057 + use correct function to get resource directory 2015-04-05 18:30:35 +02:00
Bernd Hahnebach
baba11610a FEM: add comments to CalculiX input file 2015-03-05 22:31:04 +01:00
Bernd Hahnebach
d44d0fbda3 Fem Workaround for choosing material data 2015-02-26 23:26:11 +01:00
jriegel
d17fb3aa5d First tests of using InputField via Python 2014-02-09 20:50:07 +01:00
wmayer
54334ca69d + Migrate Fem to PySide 2014-01-09 13:36:29 +01:00
Yorik van Havre
42fdbefc54 0001102: Updated all links to old freecad homepage and wiki to the new ones 2013-09-15 17:04:42 -03:00
jriegel
35d9459853 Some fixes in the Fem/Material interplay 2013-08-21 17:53:45 +02:00