Commits on Jun 4, 2011

  1. Added expression based labels, simple dialog for entering expressions. 

    Code still needs some clean up and testing.
    @NathanW2
    NathanW2 committed Jun 4, 2011
    Configuration menu
    Copy the full SHA
    2b5fb21 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2011

  1. Revert changes related to v1 labeling. Only going to support v2 label… 

    …s for now. Only return needed attributes for labeling to select (like before). Add handlers for Ok and Cancel in expression dialog box (only temp)
    @NathanW2
    NathanW2 committed Jun 13, 2011
    Configuration menu
    Copy the full SHA
    027efca View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2011

  1. Fix seg fault with using empty expression labels, added checks for em… 

    …pty expression
    @NathanW2
    NathanW2 committed Jun 18, 2011
    Configuration menu
    Copy the full SHA
    6610187 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2011

  1. Use selected text in label combo box for start off expression text

    @NathanW2
    NathanW2 committed Jun 19, 2011
    Configuration menu
    Copy the full SHA
    d954421 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2011

  1. Merge remote branch 'upstream/master' into expression-labels

    @NathanW2
    NathanW2 committed Jul 1, 2011
    Configuration menu
    Copy the full SHA
    8cddfb8 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2011

  1. Merge remote branch 'upstream/master' into expression-labels 

    Fixed merge conflict in pallabeling

Conflicts:
	src/core/qgspallabeling.cpp
    @NathanW2
    NathanW2 committed Jul 3, 2011
    Configuration menu
    Copy the full SHA
    44fddd1 View commit details
    Browse the repository at this point in the history

  2. Copy layout and code from field calculator for expression builder widget

    @NathanW2
    NathanW2 committed Jul 3, 2011
    Configuration menu
    Copy the full SHA
    14a8924 View commit details
    Browse the repository at this point in the history

  3. Rename QgsExpressionBuilder to QgsExpressionBuilderWidget

    @NathanW2
    NathanW2 committed Jul 3, 2011
    Configuration menu
    Copy the full SHA
    4b84959 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2011

  1. Redesign of expression builder UI

    @NathanW2
    NathanW2 committed Jul 11, 2011
    Configuration menu
    Copy the full SHA
    c0c4b54 View commit details
    Browse the repository at this point in the history

  2. Add model to tree view

    @NathanW2
    NathanW2 committed Jul 11, 2011
    Configuration menu
    Copy the full SHA
    e13fb8a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2011

  1. Added fields and operators to tree view

    @NathanW2
    NathanW2 committed Jul 12, 2011
    Configuration menu
    Copy the full SHA
    7d14d0b View commit details
    Browse the repository at this point in the history

  2. Insert expression string on double click

    @NathanW2
    NathanW2 committed Jul 12, 2011
    Configuration menu
    Copy the full SHA
    983a3ad View commit details
    Browse the repository at this point in the history

  3. Fill value list from selected field.

    @NathanW2
    NathanW2 committed Jul 12, 2011
    Configuration menu
    Copy the full SHA
    439a711 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2011

  1. Added support to show help about selected function

    @NathanW2
    NathanW2 committed Jul 13, 2011
    Configuration menu
    Copy the full SHA
    7454584 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2011

  1. Merge remote branch 'upstream/master' into expression-labels 

    Conflicts:
	src/core/qgspallabeling.cpp
	src/gui/CMakeLists.txt
	src/ui/qgslabelingguibase.ui
    @NathanW2
    NathanW2 committed Aug 8, 2011
    Configuration menu
    Copy the full SHA
    fc0423e View commit details
    Browse the repository at this point in the history

  2. Resolve merge conflict

    @NathanW2
    NathanW2 committed Aug 8, 2011
    Configuration menu
    Copy the full SHA
    f4c269a View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2011

  1. Update comments. Hide field value area

    @NathanW2
    NathanW2 committed Aug 10, 2011
    Configuration menu
    Copy the full SHA
    24ff1cc View commit details
    Browse the repository at this point in the history

  2. Fix build issues

    @NathanW2
    NathanW2 committed Aug 10, 2011
    Configuration menu
    Copy the full SHA
    4ffa820 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2011

  1. Merge remote branch 'wonder/expr' into expression-labels-merge-wonder

    @NathanW2
    NathanW2 committed Aug 21, 2011
    Configuration menu
    Copy the full SHA
    c343140 View commit details
    Browse the repository at this point in the history

  2. Update usage of QgsSearchString to QgsExpression

    @NathanW2
    NathanW2 committed Aug 21, 2011
    Configuration menu
    Copy the full SHA
    706b6f1 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2011

  1. Merge remote-tracking branch 'upstream/master' into expression-labels… 

    …-merge-wonder
    Nathan committed Aug 31, 2011
    Configuration menu
    Copy the full SHA
    27d3e51 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2011

  1. UI clean up; Hide and show value list when needed; handle field items… 

    … better; code clean up.
    @NathanW2
    NathanW2 committed Sep 3, 2011
    Configuration menu
    Copy the full SHA
    8f9fa6d View commit details
    Browse the repository at this point in the history

  2. Clean up labeling UI. Remove borders from frames.

    @NathanW2
    NathanW2 committed Sep 3, 2011
    Configuration menu
    Copy the full SHA
    72c045a View commit details
    Browse the repository at this point in the history

  3. Added more functions to function tree

    @NathanW2
    NathanW2 committed Sep 3, 2011
    Configuration menu
    Copy the full SHA
    c6da52c View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2011

  1. Read functions from QgsExpression. Updated FunctionDef to store group… 

    … name and help text. Add comments to code

NOTE: Reading functions list not working yet.
    @NathanW2
    NathanW2 committed Sep 25, 2011
    Configuration menu
    Copy the full SHA
    d90dcef View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2011

  1. Loading of function list from QgsExpression now working

    @NathanW2
    NathanW2 committed Sep 26, 2011
    Configuration menu
    Copy the full SHA
    f64ae1c View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2011

  1. Add method to access label string as expression, QgsExpression only c… 

    …reated once then cached.
    @NathanW2
    NathanW2 committed Oct 5, 2011
    Configuration menu
    Copy the full SHA
    107247e View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2011

  1. Add signal for expression parsed in widget; fixed enabling of control… 

    …s in labeling gui; comments
    @NathanW2
    NathanW2 committed Oct 9, 2011
    Configuration menu
    Copy the full SHA
    eb0642e View commit details
    Browse the repository at this point in the history

  2. Added new dialog for generic expression builder; Added search to func… 

    …tion list; Right click to load sample 10-All values
    @NathanW2
    NathanW2 committed Oct 9, 2011
    Configuration menu
    Copy the full SHA
    6e41cc4 View commit details
    Browse the repository at this point in the history

  3. Rename buttons and groupbox name

    @NathanW2
    NathanW2 committed Oct 9, 2011
    Configuration menu
    Copy the full SHA
    651940c View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2011

  1. Added expression output preview area. Thanks to Andy Bates for the idea

    @NathanW2
    NathanW2 committed Oct 10, 2011
    Configuration menu
    Copy the full SHA
    ee9ab82 View commit details
    Browse the repository at this point in the history

  2. used Python "and" keyword instead of && :S

    @NathanW2
    NathanW2 committed Oct 10, 2011
    Configuration menu
    Copy the full SHA
    0d187bf View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2011

  1. Remove red highlight from textarea; show expresion invaild note in pr… 

    …eview area with more info button; remove live preview checkbox and update button (not needed at this time)
    @NathanW2
    NathanW2 committed Oct 15, 2011
    Configuration menu
    Copy the full SHA
    4e6f83b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'expression-labels' of github.com:NathanW2/Quantum-GIS i… 

    …nto expression-labels
    @NathanW2
    NathanW2 committed Oct 15, 2011
    Configuration menu
    Copy the full SHA
    0359e5b View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2011

  1. Wire up operator buttons

    @NathanW2
    NathanW2 committed Oct 16, 2011
    Configuration menu
    Copy the full SHA
    5797360 View commit details
    Browse the repository at this point in the history

  2. Add item from value list on double click

    @NathanW2
    NathanW2 committed Oct 16, 2011
    Configuration menu
    Copy the full SHA
    17d326e View commit details
    Browse the repository at this point in the history

  3. Update comments

    @NathanW2
    NathanW2 committed Oct 16, 2011
    Configuration menu
    Copy the full SHA
    7f5e1c8 View commit details
    Browse the repository at this point in the history

  4. Update UI spacing

    @NathanW2
    NathanW2 committed Oct 16, 2011
    Configuration menu
    Copy the full SHA
    02123fb View commit details
    Browse the repository at this point in the history

  5. Rename files to fit QGIS coding guidelines

    @NathanW2
    NathanW2 committed Oct 16, 2011
    Configuration menu
    Copy the full SHA
    913e7e7 View commit details
    Browse the repository at this point in the history

  6. Add missing files; add more operators

    @NathanW2
    NathanW2 committed Oct 16, 2011
    Configuration menu
    Copy the full SHA
    fd50833 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2011

  1. Revert CMakeList to normal

    @NathanW2
    NathanW2 committed Oct 17, 2011
    Configuration menu
    Copy the full SHA
    1cc6bdd View commit details
    Browse the repository at this point in the history

  2. Add more function help; Fix header email info

    @NathanW2
    NathanW2 committed Oct 17, 2011
    Configuration menu
    Copy the full SHA
    047c57c View commit details
    Browse the repository at this point in the history

  3. Correct help for upper function

    @NathanW2
    NathanW2 committed Oct 17, 2011
    Configuration menu
    Copy the full SHA
    fc80b60 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into expression-labels 

    Conflicts:
	src/core/qgsexpression.cpp
	src/gui/CMakeLists.txt
    @NathanW2
    NathanW2 committed Oct 17, 2011
    Configuration menu
    Copy the full SHA
    9d3079b View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2011

  1. revert changes to old QgsLabel class

    @NathanW2
    NathanW2 committed Oct 19, 2011
    Configuration menu
    Copy the full SHA
    665e92e View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2011

  1. Merge branch 'master', remote-tracking branch 'nathan/expression-labels'

    @wonder-sk
    wonder-sk committed Oct 20, 2011
    Configuration menu
    Copy the full SHA
    847204e View commit details
    Browse the repository at this point in the history

  2. Fix indentation

    @wonder-sk
    wonder-sk committed Oct 20, 2011
    Configuration menu
    Copy the full SHA
    188d733 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2011

  1. Fixed a typo, added GUI_EXPORT

    @wonder-sk
    wonder-sk committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    bd5a31b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/qgis/Quantum-GIS

    @wonder-sk
    wonder-sk committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    5b53d93 View commit details
    Browse the repository at this point in the history