Commit Graph

320 Commits

Author SHA1 Message Date
wmayer
c4c04e3143 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
wmayer
dfff7fba5d + fix bug when releasing button after dragging point or curve 2014-08-02 17:52:12 +02:00
Ian Rees
fe4b42e3f1 Removed some debugging stuff that was accidentally pushed earlier 2014-08-02 20:04:56 +12:00
wmayer
1a3beb44b0 + fix author notes, fix memory leak, fix build failure under Windows 2014-07-30 10:05:13 +02:00
wmayer
4f71c3543e 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
wmayer
313a33b19a Squashed commit of the following:
commit 6e78052d325eadcb212a6d50c6cd09cc29ac7870
Author: Johan K <johankristensen@gmail.com>
Date:   Tue Jul 29 14:52:08 2014 +0200

    Adding missing file RegularPolygon.py

commit 416396283032a31a1ea307df23d33ecfccf37935
Author: Johan K <johankristensen@gmail.com>
Date:   Mon Jul 28 22:51:28 2014 +0200

    Replaced sketcher implementation of RegularPolygons with a Python script version.
2014-07-29 17:26:28 +02:00
Johan K
5edd3229cb Added more regular polygons to the sketcher gui 2014-07-27 00:25:40 +02:00
Johan K
2fe0087a07 Added more regular polygons to the sketcher gui 2014-07-27 00:08:49 +02:00
wmayer
552cb1a308 + Make destructor virtual for classes with virtual methods (based on DevJohan's patch) 2014-07-26 19:17:12 +02:00
wmayer
f58a94b764 + let user decide to use equality constraint or independent radii 2014-07-24 19:09:41 +02:00
wmayer
aa4bec60b1 + fixes #0001633: Allow adding radius constraints to several circles at once. 2014-07-24 13:32:47 +02:00
wmayer
3421e1773c + add missing files to install target of Sketcher module 2014-07-17 12:26:52 +02:00
wmayer
a4cd6fa0cb + split create/edit sketch command into two commands 2014-07-13 10:17:50 +02:00
wmayer
2caf767974 + implement solve() in Python API of SketchObject 2014-07-12 17:13:05 +02:00
wmayer
36c6365e00 + change comment 2014-06-07 10:56:45 +02:00
Abdullah Tahiri
14d5914651 Fixed Datum Filter showing Named non-datum variables 2014-06-07 10:50:14 +02:00
wmayer
bccc80b60a + change order of tangent and coincident constraints of slot 2014-06-06 00:33:56 +02:00
wmayer
959785098f + abort slot creation in error case 2014-06-06 00:08:26 +02:00
wmayer
977136e7e3 + whitespace improvements 2014-06-05 23:24:59 +02:00
wmayer
86d80db12c + optimize creation of hexagonal sketch profile, add icon 2014-06-04 12:05:41 +02:00
wmayer
f3a1825e73 + implement hexagon sketch 2014-06-03 14:54:27 +02:00
wmayer
34176e51f0 + fixes for sketcher 2014-06-03 11:24:49 +02:00
Yorik van Havre
867f526d3b Updated translations 2014-05-24 17:35:20 -03:00
wmayer
05e8a4f74c + fixes #0001549: crash with Draft move tool while sketch is in edit mode 2014-05-20 15:25:03 +02:00
wmayer
d431f52a2d + fix issues with angle constraints 2014-05-17 18:27:56 +02:00
Johannes Reinhardt
cd97ea6758 fix typos in Sketcher 2014-05-16 19:27:13 +02:00
wmayer
6805eb10de + do not accept objects with no sub-elements selected if this is required 2014-05-16 19:09:15 +02:00
wmayer
a0fbb11faf + fix crash in CmdSketcherMapSketch 2014-05-16 15:34:26 +02:00
Stefan Tröger
468069266c fix sketcher arrow size and make them independend from window size 2014-05-14 22:43:31 +02:00
Stefan Tröger
31771d5314 fix inverted sketcher font-size issue and make font size undependend of window size 2014-05-13 18:20:38 +02:00
Johannes Reinhardt
f722cc7bf4 fixed a few small typos 2014-05-12 14:32:27 +02:00
Yorik van Havre
b56e9a4923 Updated ts files 2014-05-11 14:49:24 -03:00
wmayer
6ac93e9d72 Add initial support for different libdir (jobermayr) 2014-05-10 12:57:38 +02:00
wmayer
7481237fdf + fix transparency issue, disable sample buffers when using front buffer 2014-05-09 19:20:30 +02:00
wmayer
4e0b52870f + fixes #0001535: Remove conflict between min/max macros and std::min/max 2014-05-08 17:30:23 +02:00
wmayer
55984a200f + fix flaws found with code analyzer tool 2014-05-07 13:09:44 +02:00
wmayer
4b2b243e47 + compile with clang 2014-05-05 16:24:01 +02:00
wmayer
d52a842379 + fixes #0001517: Problem with constraint menu not displaying properly if moved (overwrites the background) 2014-05-03 23:39:04 +02:00
mdinger
1498e99cef Move python module prefix and suffix properties into macro to be set together 2014-05-03 16:00:30 +02:00
wmayer
0a44a5b60d + Remove external geometry when changing support face 2014-05-02 12:03:52 +02:00
wmayer
6eda281ac6 Reorient sketch loses constraints (fix from chrisf) 2014-05-01 18:04:33 +02:00
wmayer
4bc20b267f + Add action to modify current item in constraint view 2014-05-01 16:12:03 +02:00
wmayer
7c7734f833 + Add context-menu to constraint view for renaming and deleting items, fix edit mode 2014-05-01 15:36:52 +02:00
wmayer
67edfb895b + Fix prefix of Python extensions built with MinGW 2014-04-30 18:22:52 +02:00
mdinger
e2bd648e9a Remove unnecessary quotes. 2014-04-30 13:41:16 +02:00
mdinger
3e3ce381f6 Apply SET_BIN_DIR macro to Mod 2014-04-30 13:41:13 +02:00
wmayer
e3684706cb + fixes #0001514: Padding a sketch inside a group fails with error message 2014-04-25 17:28:32 +02:00
jriegel
53b439e1f1 Some fixes for ProfileLib 2014-04-17 06:33:58 +02:00
jriegel
16cc37f9b3 fix wrong cursor icon in Slot 2014-04-17 06:33:57 +02:00
jriegel
8f6d4d5891 Implement Constraint creation on Slot 2014-04-17 06:33:57 +02:00