Commit Graph

5202 Commits

Author SHA1 Message Date
Przemo Firszt
987dddfc78 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
4b56d3d406 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
35c5de0782 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
25c18729e1 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
2d90d39cc3 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
d3c7270031 FEM: Fix typos
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-04-17 10:51:56 +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
76aa89b536 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
2acfadfeef 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
663771f0a4 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
6750127a05 Arch: Added materials support 2015-04-15 22:08:54 -03:00
Ian Rees
f068e723ea Remember last tab selected in PropertyView 2015-04-15 09:12:30 +12:00
wmayer
38ca5341a6 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-04-14 16:34:11 +02:00
wmayer
0c1fb8e4d8 + delay checking for ccx path, handle exceptions 2015-04-14 16:33:44 +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
b7bb4346da 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
bf179d9f78 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
7ddd9d2ce0 check BoundingBox before calling distToShape
to find intersecting edges. issue #2050
2015-04-14 10:12:04 -03:00
wmayer
f6638d49ce + improve abaqus export 2015-04-14 13:33:20 +02:00
wmayer
0e91902e74 + move to Qt's built-in search system for icon resources 2015-04-14 11:37:24 +02:00
wmayer
2dc1890fd2 + fix rendering problems for FEM elements 2015-04-13 22:11:27 +02:00
wmayer
1c79de55ed + workaround for limit of length of file names 2015-04-13 18:23:30 +02:00
wmayer
618192fca5 + fix critical memory leak 2015-04-13 17:24:54 +02:00
wmayer
f53fd0fe90 + allow PNG format with POV-Ray 3.7 on Windows 2015-04-13 11:12:14 +02:00
wmayer
0c0365bb49 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-04-13 10:33:39 +02:00
wmayer
d9b6007722 + fix wrong template path for Raytracing/Lux project 2015-04-13 10:33:10 +02:00
Yorik van Havre
a7c346606f Material: Fixed bug in cmake file from commit 6685ae0 2015-04-12 19:21:32 -03:00
wmayer
3e1e5974f0 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-04-12 18:39:27 +02:00
wmayer
8991b9e04b + add Document::sendMsgToFirstView, fix memory leak 2015-04-12 18:39:01 +02:00
Yorik van Havre
6685ae0142 Material: Added prefix to steel material cards 2015-04-12 13:31:49 -03:00