Commit Graph

1971 Commits

Author SHA1 Message Date
Yorik van Havre
da97cddb14 Merge pull request #4780 from matthijskooijman/fix-flat-groups-section-view
Arch: Fix section view duplicate rendering of items in groups with only flat objects
2021-05-11 12:13:09 +02:00
Matthijs Kooijman
2a60d81c7d Arch: Do not draw draft-like groups twice in section view
When drawing a section view, first a list of objects to draw is made.
Starting with the objects selected by the section plane, any groups or
group-like objects are recursively expanded. The resulting list contains
all contained objects, but also the expanded groups themselves (due to
Draft.get_group_contents with addgroups set).

This list of objects is then further categorized and processed. In this
categorization, there was already an exception for DocumentObjectGroup
instances, which were omitted from the resulting `nonspaces` list
(presumably since there is no point in drawing the groups themselves
when their contents are already in the list).

However, any groups that only contain flat objects would be caught by
`looksLikeDraf()` and added to the `drafts` list, before this exception
could ignore them.

This causes these groups to be processed by Draft.get_svg, which does so
by calling itself recursively on the group contents. Effectively, this
means that the contents of such groups is drawn on the section view
twice. Even more, since Draft.get_svg does not do a visibility check
like Arch.getSVG does, this causes invisible objects to show up when not
intended.

This commit fixes this by moving the DocumentObjectGroup exception a bit
further up, so all these objects should be dropped.

An alternative fix might be to pass addgroups=False to
Draft.get_group_contents (in getSectionData), but that also prevents
group-like objects (Building, BuildingPart, Space, Site) from being
returned, but those likely need to be returned so they can be sectioned
if needed (though if just spaces are needed, then
Draft.get_group_contents also have a spaces argument to return just
those).
2021-05-09 17:19:05 +02:00
Yorik van Havre
5705bb8aa8 Arch: Small translation fix 2021-05-06 18:37:40 +02:00
Yorik van Havre
966906da96 Merge pull request #4557 from luzpaz/crowdin/whitespaces-substituted-into-code
Crowdin: represent whitespace in code instead of in string
2021-05-05 17:18:35 +02:00
Amritpal Singh
feb8746563 Arch: allow Rebar OffsetStart and OffsetEnd in negative also 2021-05-03 23:06:05 +05:30
Yorik van Havre
ba99b72984 Merge pull request #4748 from steelman/material-color-dialog
Arch: Fix material color pickers
2021-04-22 11:05:11 +02:00
Łukasz Stelmach
e3df634a20 Arch: Fix material color pickers
Provide currently set color as initial value for getColor() to enable
convenient incremental changes.

Do not change the colour if the Cancel buton was pressed.

Signed-off-by: Łukasz Stelmach <stlman@poczta.fm>
2021-04-21 17:11:10 +02:00
Łukasz Stelmach
ba63ef51e5 Arch: Parse window opening modes with more than one digit
Signed-off-by: Łukasz Stelmach <stlman@poczta.fm>
2021-04-20 15:02:13 +02:00
luz paz
b94ee8b275 Crowdin: represent whitespace in code instead of in string [skip ci]
Removing possible whitespace from strings lead to more accurate translations
2021-04-19 06:16:09 -04:00
Stephen Early
c617b252ff Improve WebGL export javascript template
Several improvements to the javascript in the template:

 * Render on demand rather than continuously
 * Support high-DPI displays
 * Fix the frustum depth for both cameras
 * Deal correctly with the browser window being resized
 * Only show controls for objects with geometry

Also some changes made for code clarity:

 * Use 'const' and 'let' instead of 'var', as appropriate
 * Use for...of and .map() instead of iterating over arrays
   using a loop counter
2021-04-10 18:03:09 +01:00
Yorik van Havre
c18d98a60d Merge pull request #4299 from three-ddd/archstairs_connections_flight_landing
[0.20] [Arch] connections between stair flight and landing
2021-03-30 13:17:24 +02:00
Yorik van Havre
edfd7e055d Merge pull request #4517 from Roy-043/Arch_Roof_fix_for_adjust_list_len
[ARCH] Arch_Roof fix for adjust_list_len function
2021-03-30 13:05:10 +02:00
Yorik van Havre
1ba31301e9 Merge pull request #4547 from chennes/lgtmArchUnusedIterationVariable1
[Arch] Refactor to eliminate unused variable
2021-03-30 13:01:06 +02:00
Matthijs Kooijman
4346d87c88 Arch: Fix displayed rotation values when adding or editing window components
This ensures the rotation edge and mode GUI elements are cleared when starting
to add or edit a component. Previously, when adding a new component or
editing one without rotation, the GUI elements would retain the value
from the previously edited component, which made it hard to check that
components did not have any rotation, and would make it easy to
accidentally add rotation to components that did not need it (just by
clicking edit and confirming).
2021-03-30 12:40:06 +02:00
Yorik van Havre
dce69f3c7b Merge pull request #4550 from chennes/lgtmDice3DSIssues
[Arch] LGTM issues in Dice3DS
2021-03-26 11:30:11 +01:00
Yorik van Havre
08f9406814 Merge pull request #4631 from sde1000/webgl-export-camera-buttons
Fix camera position buttons in WebGL export
2021-03-26 11:29:03 +01:00
Yorik van Havre
dccad1d247 Merge branch 'master' into Arch_Roof_fix_for_adjust_list_len 2021-03-26 11:23:56 +01:00
Yorik van Havre
4c1635706e Merge pull request #4453 from regularfry/lgtm-arch-unused-imports
Arch: removes unused imports
2021-03-26 11:22:11 +01:00
Yorik van Havre
6189aee357 Merge branch 'master' into alafr-arch-structure 2021-03-26 11:08:01 +01:00
Stephen Early
261ad81b0e Fix camera position buttons in WebGL export
Fix the "View Top" and "View Front" buttons on pages generated with the
WebGL exporter to select the same views as the FreeCAD Navigation Cube.
2021-03-17 18:48:19 +00:00
David Osterberg
c1b3fba031 Beautify xml step 1: These changes do not affect the uic output 2021-03-02 16:29:11 +01:00
Chris Hennes
96406ff97c [Arch] LGTM issues in Dice3DS
LGTM identified a few minor issues in the Dice3DS code -- none of them
appear to be real errors, so the changes here should not affect the
behavior of the code.
2021-03-01 10:35:39 -06:00
Yorik van Havre
19e4113de4 Arch: Fixed SectionPlane outside objects bug in ArchSectionPlane - Fixes #4549 2021-03-01 16:49:31 +01:00
Chris Hennes
6640f13be1 [Arch] Refactor to eliminate unused variable
LGTM complains about the unused variable in a loop that is really only
using the variable to iterate a set number of times. This replaces that
loop with a multiplication by the length of the array, eliminating the
unused iteration variable and clarifying the intent of the code.
2021-02-28 23:42:14 -06:00
Yorik van Havre
fa85db61f9 Merged crowdin translations 2021-02-25 13:27:48 +01:00
Yorik van Havre
5c12afb5b5 Merged crowdin translations 2021-02-24 18:07:59 +01:00
Roy-043
99af124f80 [ARCH] Arch_Roof fix for adjust_list_len function
LGTM code analysis did not like that the adjust_list_len function would mutate default list values. De function now always clones the list.
See: https://forum.freecadweb.org/viewtopic.php?f=23&t=55943
2021-02-23 19:58:39 +01:00
Bernd Hahnebach
486febf3dc Arch: ifc export, save guid to obj attribute 2021-02-22 01:50:47 +01:00
Yorik van Havre
b2cb259ef5 Merge pull request #4479 from Roy-043/ArchRoof-compatibility-fix-2
[Arch] ArchRoof: Improved compatibility fix
2021-02-18 15:46:52 +01:00
Roy-043
f9d93749bc [Arch] ArchStructure.py wrongly used Part.Line (endless line) to close a wire. 2021-02-17 23:29:01 +01:00
Roy-043
fbe7178cdb [Arch] ArchRoof: Improved compatibility fix
The check if a relative profile in turn references a relative profile has been improved. Added: run or angle of profilRel must be zero.
2021-02-17 21:35:51 +01:00
Bernd Hahnebach
b44075912a Arch: add BIM_Classification command before make use of it 2021-02-15 16:13:30 +01:00
Yorik van Havre
41d3169491 Merge pull request #4449 from paullee0/ArchSectionPlane_BugFixes_01
[ArchSectionPlane]  Fix Swing for Windows(Doors) Link in ArchView/TD
2021-02-15 13:25:36 +01:00
Yorik van Havre
3683ba1ce5 Merge pull request #4434 from Roy-043/Arch_Fix_ArchPipe
[Arch] Fix for ArchPipe: getProfile returned Shape instead of Wire
2021-02-15 13:24:28 +01:00
Alex Young
80dbfd5814 Arch: removes unused imports
Removes unused imports as reported by LGTM.

There are exceptions: `import Arch_rc` is shown as an alert, but has side effects.  It's not clear what the best thing to do in those cases is, so I've left them for now.
2021-02-14 16:27:06 +00:00
paul lee
f521d8ca6b [ArchSectionPlane] Fix Swing Symbol for Windows(Doors) Link in ArchView/TechDraw
Forum Discussion  :  [ Link in Arch/BIM -- 4 ] Link of Door : Swing Not Shown in ArchView/TechDraw
- https://forum.freecadweb.org/viewtopic.php?f=23&t=55526
2021-02-14 03:13:36 +08:00
Yorik van Havre
0de8cceb53 Updated ts files 2021-02-12 14:47:37 +01:00
Roy-043
61269c45c7 [Arch] Fix for ArchPipe: getProfile returned Shape instead of Wire
Fix for ArchPipe: getProfile returned Shape instead of Wire
2021-02-11 21:13:36 +01:00
Chris Hennes
9d1958475e [ARCH] Catch only Exception, not BaseException 2021-02-11 11:52:45 +01:00
Yorik van Havre
97379e035a merged crowdin translations 2021-02-09 16:12:18 +01:00
luz paz
8eec5d56dd Arch: update tooltip ref. to LibreOffice version within ArchSchedule
Ref: https://crowdin.com/translate/freecad/6766/en-en?filter=basic&value=0#6576778
2021-02-08 12:56:53 -05:00
Yorik van Havre
5d18625677 Updated master TS files 2021-02-08 16:35:41 +01:00
three_d
8d040e0d3d Merge branch 'master' into archstairs_connections_flight_landing 2021-02-05 22:44:48 +01:00
luz paz
058e54a5b7 Arch: Fix LGTM warning of missing param for translate() in ArchPanel.py
Even though this is ignored per the docs[1], LGTM complains[2] about it. This commit adds the superfluous param. Note: there is precedent in ArchReference.py[3] and ArchWall.py[4].
 
 [1]https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Draft/draftutils/translate.py#L73-L78  
[2] 17db14c970/files/src/Mod/Arch/ArchPanel.py (L32)  
[3] 50f5c6ef9a/src/Mod/Arch/ArchReference.py (L39)  
[4] 50f5c6ef9a/src/Mod/Arch/ArchWall.py (L42)
2021-02-03 10:28:21 -05:00
Stefan Tröger
ec5ac30756 Remove ExtensionProxy and rely on default Python proxy for extensions. fixes #0004534 2021-01-30 16:00:48 +01:00
Roy-043
90e0e616b1 Fixed typo in Arch_Schedule
Typo
2021-01-22 20:17:47 +01:00
three_d
10ec3016ef Update ArchStairs.py 2021-01-22 19:09:18 +01:00
three_d
193caf07f7 Arch: connections between stair flight and landing
Added some features to allow the user to change the types of connections between the flight of stairs and landing.
This issue is discussed in the forum thread: https://forum.freecadweb.org/viewtopic.php?f=22&t=53018
2021-01-21 18:41:23 +01:00
Roy-043
b31667dbc7 Update ArchRoof.py
A relative profile can now be used if it references itself. This fixes a compatibility issue with the V0.18 version of ArchRoof, where the first profile initially always references itself.
2021-01-20 19:17:30 +01:00
paul lee
66807c7437 [ArchComponent] Fix Link Of Window Hosts if empty got error as Wall Child 2021-01-18 02:08:39 +08:00