Commit Graph

4862 Commits

Author SHA1 Message Date
wmayer
3442eecb7a + FEM: remove useless error message 2015-04-20 11:35:40 +02:00
wmayer
16362ef79a + do not translate units 2015-04-20 10:48:06 +02:00
wmayer
7fbb50df61 + do not translate units 2015-04-19 23:41:27 +02:00
Yorik van Havre
bed600f883 Arch: misc improvements to materials and IFC
* Improved IFC export of curved surfaces
* Better icon for materials group
* Fixes in IFC export of materials
2015-04-19 16:34:36 -03:00
wmayer
761fb84684 + update Debian packaging files 2015-04-19 13:42:02 +02:00
wmayer
a628da459e + remove broken command from FEM workbench 2015-04-18 22:06:55 +02:00
Yorik van Havre
e6883bafc3 Arch: Enabled materials in IFC import & export 2015-04-17 19:43:54 -03:00
wmayer
f52ed288c1 + fixes #0001998: For 32 px and 48 px the icons with a submenu in toolbars are not display at the good size 2015-04-17 23:16:28 +02:00
wmayer
40883ac597 + use .dylib for normal shared libraries under MacOSX 2015-04-17 18:13:51 +02:00
Przemo Firszt
8e8839a922 FEM: Fix typo in fem_console_message name
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
7de378367b FEM: Fix rare crash related to the date of compilation of ccx
Printing FEM console message could fail if ccx was compiled in March
and standard output contained double dotted a.
"You are using an executable made on Mi 4. Mär 19:49:02 CET 2015"

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
0880940efb FEM: Fix typo. Rename MathObject to MaterialObject
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
710d3d7bcd FEM: No need to check length, empty list evaluates to False
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
0a0f54d651 FEM: Disable "open editor" and "run ccx" buttons.
This commit moves checking prerequisites to function. The function
is called before writing .inp file to make sure all required objects
are included in the analysis. "open editor" and "run ccx" buttons are
if check_prerequisites runs successfully.

Reported-by: wmayer
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
b34f1b57dc FEM: Make sure cursor gets restored if write_calculix_input_file fails
Reported-by: wmayer
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
be3ad02be7 FEM: Fix typos
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
111fc74987 FEM: Group all helper functions together
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
3526d05ba4 FEM: Rename chooseMat to choose_material
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
b6360a860c 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
74caa6e6fd 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
a76e7ea029 FEM: Catch ccx errors and print to FEM console in red
Code by wmayer

http://forum.freecadweb.org/viewtopic.php?f=18&t=10514&p=84921#p84901
2015-04-17 10:51:56 +02:00
Przemo Firszt
4856df86ce FEM: Change way of converting ccx output to unicode
Previous method was prone to UnicodeDecodeError. The try-catch for
UnicodeDecodeError stays in as additional safety net.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Przemo Firszt
6fe0da61a3 FEM: Sort materials within each category
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +02:00
Yorik van Havre
514c7a14ac Arch: Added materials support 2015-04-15 22:08:54 -03:00
Ian Rees
e0ce0808e8 Remember last tab selected in PropertyView 2015-04-15 09:12:30 +12:00
wmayer
ad103ec005 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-04-14 16:34:11 +02:00
wmayer
a2ccc5ab91 + delay checking for ccx path, handle exceptions 2015-04-14 16:33:44 +02:00
Przemo Firszt
26c9ead871 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
acc23c208f 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
841f8150cf 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
995e917da0 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
2e95c8d7b9 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
b46fb12fe7 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
8185ec159b 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
dfb7212ec2 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
bf50cf9aec 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
4bc1cd6d44 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
06e27d051d 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
3356c10d44 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
c777bdef76 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
d33650596a 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
6848c9a9ca 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
33b4579d72 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
072ae57378 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
4232ab88d8 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
21ee31afb5 FEM: Fill default ccx binary location in Preferences
ccx path is filled for linux and windows if it was empty.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:33 +02:00
Przemo Firszt
1f96d235ff FEM: Add option to define ccx path in Preferences
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-14 15:25:32 +02:00
Sebastian Hoogen
b17bfdc3ee check BoundingBox before calling distToShape
to find intersecting edges. issue #2050
2015-04-14 10:12:04 -03:00
wmayer
800a0a7b67 + improve abaqus export 2015-04-14 13:33:20 +02:00
wmayer
06685a91f0 + move to Qt's built-in search system for icon resources 2015-04-14 11:37:24 +02:00