Commit Graph

5202 Commits

Author SHA1 Message Date
wmayer
28490532f5 + fix dir2qrc script to keep alphabetical order of file names, update Sketcher.qrc 2014-08-07 20:29:31 +02:00
Abdullah Tahiri
e2db94facd updated icons for sketcher
- Selection icons added.
- Art by Jim
- Clean up sketcher xpm small icons: Only constraint icons seem to be necessary
2014-08-07 19:49:51 +02:00
Abdullah Tahiri
b5002dc6fe changes in sketcher
- Varios minor bug fixes.
- Added the other commands to the toolbar.
- Bug fix: missing AbortCommand().
- Mode Auto-switch to edge (Sponssi mode) has selection combo disabled to avoid interferring with this mode.
However, if auto-switch checkbox is unchecked (Jim-Abdullah mode), the combo is enabled and selection of
element type can be effected via the combo with the mouse.

In any case "z" shortcut iterates round robin the "valid types" of the preselected (hovered) element.
2014-08-07 19:49:51 +02:00
wmayer
09b8b25144 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-08-07 19:47:11 +02:00
wmayer
1cd2dab81f + rename duplicate class name 2014-08-07 18:41:54 +02:00
Yorik van Havre
3c0c72e4c0 Draft: removed macros menu - fixes #490
The macros menu code is on http://www.freecadweb.org/wiki/index.php?title=Macro_MacroMenu
2014-08-07 11:07:22 -03:00
Yorik van Havre
dc3ebfb502 Fix in Drawing page object - fixes #1540
* Changing the editable texts updates the page automatically
* Added a doc.recompute() after creating a new page
2014-08-07 10:39:33 -03:00
Yorik van Havre
e0bdc07c4d Fixed output of ViewObject attribute in console mode 2014-08-07 10:38:41 -03:00
Yorik van Havre
c66de2f8cb Draft: fix in SelectGroup tool - fixes #1568 2014-08-06 19:55:26 -03:00
Yorik van Havre
dbed1e35e5 Draft: small fix in Array object 2014-08-06 19:33:55 -03:00
wmayer
bd64ce3bb7 + implement save() function in PointKernel, fix icon issue in mesh workbench 2014-08-06 17:39:15 +02:00
wmayer
0c2d201396 + fix security issue (do not run uncontrolled format string) 2014-08-06 10:16:06 +02:00
Yorik van Havre
46583f2960 Used Gui.addModule() instead of import in Draft & Arch 2014-08-05 19:38:40 -03:00
Yorik van Havre
81e983b6ac Exposed doCommand (Gui version) to python - fixes #1564 2014-08-05 19:28:36 -03:00
Yorik van Havre
6dd35078a2 Draft: issue message if an object cannot be moved or rotated - fixes #1642 2014-08-05 18:28:26 -03:00
Yorik van Havre
234af5b27f Arch: improvements in Space object
* Better text control
* Text position editable with Draft Edit
* Additional properties such as finish types
2014-08-05 16:19:39 -03:00
wmayer
be3299a46d code review: move transaction to outside from loop, fix several bugs, fix whitespaces 2014-08-05 00:35:03 +02:00
wmayer
1011dd4175 Squashed commit of the following:
commit 695becbbfff961b13e3edb5a4e1e4487bc53b4bb
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Aug 4 15:24:33 2014 +0200

    - Making combo disable state.
    - Updating Art (Thanks Jim!)

commit d5391d40ace450fa2e65fe2b4ab8029ad37cacf8
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Fri Aug 1 00:40:15 2014 +0200

    - Adaptation of code to Workbench's new Template structure.
    - Minor adaptation of new ViewProvideSketch code to new constraint code (only in code extensions needed for element Widget)

commit ecdec20afa33c9a950e6054e80e4aa9c72aad8b6
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jul 31 15:31:38 2014 +0200

    Fix so that when applying a coincident constraint to a plurality of points,
    if one constraint on a couple of points exists, no new coincident constraint is
    added to this couple.

    Fixes: http://forum.freecadweb.org/viewtopic.php?f=3&t=6890

commit 32ef59d76e6c63356f5d36598ca11eb47c2e52af
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jul 31 14:13:58 2014 +0200

    Add some placeholder art for icons to avoid having a cross icon and annoying icon not found messages.

commit ccb60a3a7e71a0eb8ad5d896542314a98ef314a8
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jul 28 20:15:29 2014 +0200

    - Fixed Length Constraint accelerator (D) to SHIFT+D to avoid colision with other higher level FreeCAD accelerator assignment.
    - Selection Accelerators now toggle on shortcut execution, and act when no other element is selected (fixed bug)

    TODO: Art+Toolbar

commit 791358d046e8eeb03fa00272f5627c75254c48eb
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jul 28 15:12:07 2014 +0200

    Fixing shortcut system:
    - Take shortcuts automatically from CommandManager.
    - Fixed two shortcuts in CommandConstraints (Point on Object - O and
    Parallel Constraint - P to SHIFT+O and SHIFT+P to avoid collision with other constraints)
    - Fixed shortcuts in CommandConstraintAccel to non-already-existing combinations
    - Fixed Sketcher Menu to show accelerators

commit 12d366406a45038ce1a4f725a98e4f570475084b
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jul 28 11:53:37 2014 +0200

    Implemented SHIFT multiple selection functionality in listwidget.

commit 0606ea7dfe38fdf8924f65f14382f1b327145c80
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jul 28 11:02:02 2014 +0200

    Added Sketcher Accelerators for:
    - Selection of H Axis
    - V Axis
    - Origin

    Main TODO: Shortcuts and Shift in list widget implementation

commit 297464807fc56fbcf31efadff9625fc05bb20c41
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Wed Jul 23 11:37:21 2014 +0200

    Implementation of:
    - Switch on 'Z' instead of 'Shift'
    - Checkbox to select whether element internal name (e.g. Edge10) should be presented on list or not (Sponssi requested)
    - Checkbox to force going back to "Edge" type on change from one element to the next (Sponssi requested)

commit c8764b116acdcfdc7ef7658dc6009fb8db807906
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Wed Jul 23 07:57:11 2014 +0200

    TaskSketcher Elements:
    - Store Vertex within elements for optimization (reduce loops searching for vertex in every function call)
    - Added the accelerators described below + Toggle Construction as context menu commands
    - Fixed bug (Thanks sponssi!): After some element has been preselected from the list and the cursor moved to the drawing area,
    the preselection doesn't seem to be resetted in the widget or whereever it is handled.
    Tapping shift still swaps the preselection between the points of the previously selected element.
    The left mouse button has to be clicked in the draw area to get rid of this.
    http://forum.freecadweb.org/viewtopic.php?f=10&t=6861&sid=7eea4adc7ecf4cebd561b357601866a2&start=20
    - Extended naming of elements, to facilitate writing python code (as requested by sponssi).
    - Minor modifications (creation of utility fuctions, code readibility, ...)

    Sketcher Workbench:
    - First effort to add a toolbar with the accelerators.

    Sketcher Accelerators: (Perform actions on existing elements, as opposed to Geometry Creation, not restricted to applying constraints)
    - Close Shape : of selected edges (i.e. lines and arcs)
    - Connect : selected edges (connect endpoint edge with starting point of next edge according to selection order)
    - Select Constraints : associated with currently selected edges

commit 1dc18204a4e2e38f71d729a7692383f50a7d4654
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Sat Jul 12 16:06:48 2014 +0200

    New alternative implementation of the Sketch Element List.

    This version comprises:
    - Identification via icon of type of geometric element (Point, Arc, Line, Circle) and
      Type of selection (Edge, Starting Point, End Point, Center Point)
    - Corrected a bug where upon selection from the combobox, the icons were not updated (Thanks Jim!)
    - Implementation of jump to next valid type of last preselected element (aka fast-forward) for all the types.

commit 4d472ef796362405c3982355f86489fa92cbfe6d
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jun 26 17:15:51 2014 +0200

    Feature request by jmaustpc
    - When an object does not have an element, lets put a different icon.
    - Currently the constraint lock icon is used until availability of a new one.

commit 6d15478f6533ff3805520a8ca36d1c41908cb0af
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jun 26 14:54:23 2014 +0200

    Bug fix (preselection not disappearing on changing element without the element Type).

commit e33043e17781fcf6399257696f115f68ab4580ec
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jun 26 14:39:20 2014 +0200

    New nicer icons by jmaustpc. They look much nicer :-)

commit 2ce2d6ff1ad2d81b0b1e30ffcbe9f2cc445f2e5b
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jun 26 14:37:21 2014 +0200

    Fast-Forward functionality:
    - If an element not having "midpoint" is preselected, then on pressing SHIFT the
    Type will jump from EndPoint to Line skipping midpoint.
    - This is intended as a productivity feature, as most sketch elements usually are lines

commit 1865d06d06582a49da10ddc123133807a4593060
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Wed Jun 25 15:47:22 2014 +0200

    Bug fix (thanks jmaustpc)
    - Preselection is maintained even though the geometric element does not have the "Type".
    - Fix involves calling for remove preselection in TaskSketcherElement
    - Implementing the response to the message RmvPreselection in ViewProviderSketch

commit 14e21da4b4ed0e9a2b3e846a4e51f6745d5e0ab7
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jun 23 14:25:35 2014 +0200

    Fix Bug with null pointer (thanks jmaustpc!)
    Clean up code

commit 0d99eb633f1bca45d4e7bb22c57bd4892767a390
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Wed Jun 11 16:32:48 2014 +0200

    New widget for the Taskbar of the Sketcher WB.

    The objectives of this widget are:
    1. Allow editing of sketches when they have (partially) overlapping lines of any type
       (construction/external/normal).
    2. Allow the construction of sketches using the keyboard (less mouse intensive)

    The widget works as follows:
    1. A QListWidget presents a list of elements, element is here a geometric element
    formed Types edges, starting points, end points and midpoints (e.g. circles, arcs)
    2. On hovering/Entering one item in the list, it is preselected for easy identification.
    3. The selection can be switched from one type to another using the SHIFT key
    (press and release) in a round-robin fashion (or you can select it using the droplist)
    4. Selection of different types is possible (e.g. two points and a line).
    5. The contextual menu accessible by right click allow to apply a constraint to the
    selection.
    6. The constraints in the contextual menu have shortcuts, so you can actually use the
    shortcut directly from the QListWidget.

    Additional features introduced to other parts during development...
    - New color introduced for Types that are selected and preselected at the same time
    - Edges is a SoLineSet. You can not apply many So modifiers (width,offset) to parts of a SoLineSet.
    An edge part of a SoLineSet that is drawn after another one, covers it unless it is closer to the
    camera. The system of manual offsets already in place for points has been extended to properly
    handle (i.e. show) overlapping lines part of a SoLineSet.
2014-08-05 00:35:02 +02:00
Yorik van Havre
62e9b60816 Added a couple of missing units in MKS schema 2014-08-04 19:16:10 -03:00
Yorik van Havre
f5f6cb1adf Arch: Enhanced Space tool - fixes #1610 2014-08-04 18:24:20 -03:00
Yorik van Havre
a7d1b80fc3 Draft: Fixed offset in SelectPlane tool - fixes #1606 2014-08-04 13:53:38 -03:00
Yorik van Havre
a601434c27 Draft: adapted Draft2Sketch tool for macro recording - fixes #1661 2014-08-04 12:37:59 -03:00
Yorik van Havre
e41996c9db Draft: default Z to 1 in Scale tool - fixes #1660 2014-08-04 12:01:44 -03:00
Yorik van Havre
caf02318b5 Arch: Included some utility functions into Arch module
* makeCompoundFromSelected: creates a compound object from selected subobjects
* cleanArchSplitter: cleans the splitters on imported Arch objects
* rebuildArchShape: tries to rebuild a solid from the faces of an invalid shape
2014-08-04 11:11:11 -03:00
jriegel
36a0641edd App and Base Compiles with new LibPack 2014-08-03 22:56:52 +02:00
Johan K
83a5f1547f Adding selectNumber handling of locale, this wont work with groupseparators 2014-08-03 22:31:57 +02:00
jriegel
ec2198107b move build specifier in own cMake group 2014-08-03 20:53:19 +02:00
jriegel
c24a5161fc New LibPack 10 for Win 64 2014-08-03 20:37:06 +02:00
Yorik van Havre
c7bfaf2ed7 Arch: small bugfixes and optimisations 2014-08-03 15:14:33 -03:00
Johan K
5cfdabb45a Adding changes 2014-08-03 20:13:05 +02:00
jriegel
b32b227733 clean up number scanner in Units 2014-08-03 17:24:42 +02:00
jriegel
1da5543657 fix swedish minus simbol 2014-08-03 16:01:21 +02:00
wmayer
ced08b0416 + fix memory leak 2014-08-02 18:26:23 +02:00
wmayer
578fbbefa4 + fix bug when releasing button after dragging point or curve 2014-08-02 17:52:12 +02:00
Ian Rees
c836dab53d Removed some debugging stuff that was accidentally pushed earlier 2014-08-02 20:04:56 +12:00
Yorik van Havre
2d8963de03 Arch: Added scaling in IFC importer 2014-08-01 21:44:46 -03:00
Yorik van Havre
a548203ca9 Arch: removed obsolete IFC preference options 2014-08-01 21:34:49 -03:00
Yorik van Havre
3b86494afb Arch: fixed bug in wall extrusions 2014-08-01 21:28:32 -03:00
Yorik van Havre
bf101bbfcb Draft: Array objects now have an IntervalAxis property to build helicoidal compounds 2014-08-01 20:57:53 -03:00
Yorik van Havre
fec636b835 Arch: Introduced new IFC importer/exporter
* The new IFC importer uses excusively the newest ifcopenshell.py module
* Renamed old importer to importIFClegacy.py
* Included the now deprecated ifcReader and ifcWriter modules into importIFClegacy
* The new IFC importer falls back on the older one if the ifcopenshell module is not found
2014-08-01 18:39:10 -03:00
wmayer
7a3ddd5bae + fix author note, fix various crashes, improve mesh selection stuff 2014-08-01 16:39:59 +02:00
wmayer
4032a88c2d Revert "remove TKAdvTools"
This reverts commit 6843d6ad5d.
2014-08-01 15:07:27 +02:00
Yorik van Havre
f0d5564747 Draft: DXF lib is now pulled from its specific branch 2014-07-31 11:26:17 -03:00
wmayer
406d32aebb + Replace InputField with QuantitySpinBox 2014-07-31 15:14:27 +02:00
wmayer
609422f08a More detailed error message when xerces fails to read in parameters 2014-07-31 10:58:48 +02:00
Yorik van Havre
d946499e4d Draft: diverted current dxfLibrary download folder 2014-07-30 23:54:14 -03:00
wmayer
e327662d28 0001638: Not possible to draw anything. 2014-07-30 18:21:53 +02:00
wmayer
7294271c0c + Allow to get clean copy of a shape from Python 2014-07-30 12:21:22 +02:00
wmayer
a252471625 + fix author notes, fix memory leak, fix build failure under Windows 2014-07-30 10:05:13 +02:00
wmayer
6ca580456b Squashed commit of the following:
commit 8853bf442b6e1a98699fa90fca5eb30b3f6d3a5e
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Jul 29 15:46:59 2014 +1200

    Refactoring and small fix in constraint icon bounding boxes

commit c03e4c13d8fd657e18e3c78d16bbdef209f8c779
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Jul 28 15:41:15 2014 +1200

    Implemented picking of individual constraints from combined icons

commit 254aaab450fe6646bee7542c532c454af91b6597
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Jul 28 13:04:18 2014 +1200

    Added bounding boxes for combined constraint icons

commit 4f0738ec30220fbf1abdea14dd121d0a134e5dfd
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sat Jul 26 18:53:33 2014 +1200

    Added screenCoordsOfPath() to View3DInventorViewer

commit 14e2dc7b4aa79db97cbacd2c848728a66276d644
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Jul 20 14:24:27 2014 +1200

    Bit of code to make constraint icon text rendering nicer.

    This won't be useful unless the font changes, but wanted to add it while
    I was thinking about it.

commit 8020d2d62214d71875cbae101d5ac5e96d998201
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Jul 20 13:54:51 2014 +1200

    Fixed an off-by-one in ViewProviderSketch::combineConstratintIcons

    Bug resulted in icons occasionally not being combined into groups,
    when they should've been.

commit 20d92a3ccc1f795be1cb86f6f92045518dc8eb81
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Jul 15 19:38:20 2014 +1200

    Fixed a bug that was introduced two commits ago.

commit 69e1ea848e3bc3c8c372c539f30a7b4d2a563aa2
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Jul 15 15:33:30 2014 +1200

    Fixed dumb copy-and-paste error

commit a998b75a905cc31e1f4f49869e81ecaef5858b69
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Jul 13 18:39:22 2014 +1200

    Fixed crash reported by sponssi

    More info at http://forum.freecadweb.org/viewtopic.php?f=10&t=6965&p=56590

commit 27b7b804790dda5164c7ef0b9418f6c160228859
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Jul 10 13:32:16 2014 +1200

    Cleaning up my git repo for FreeCAD.

    This branch now has just the Sketcher icon fixes, plus a few random comment edits.
2014-07-30 10:05:12 +02:00