Skip to content

feat(draw): Make multiple layers with the drawing tool #1081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 65 commits into from
Nov 14, 2022

Conversation

kalvinkhuu
Copy link
Contributor

Please check if the PR fulfills these requirements

What is the current behavior? (You can also link to an open issue here)

Link to the issue

What is the new behavior?

  1. User can now have multiple drawing layers.
  2. Those layers have the same interactions with the map tab.

Does this PR introduce a breaking change? (check one with "x")

  • Yes
  • No

If this PR contains a breaking change, please describe the impact and migration path for existing applications:

Other information:

kalvinkhuu added 30 commits May 19, 2022 10:33
   * In the store, each entities have their own style, but when applying the style,
   * the setStyle function does not recognize each entities
   *
   * TODO:
   *  Either redo the setStyle function to take in entities or find a
   *  way to change the features inside the store
   *
   *  When changing the label, set the style to the original style
   *
   *  Repeat this for all colors
   *
   *  Remove any useless things and add comments
draw.interface.ts:
	Add attributes for color stroke and color fill
draw.component.ts:
	Change the global variables of fillForm and strokeForm
	Create functions to return their color stroke and fill
	Do a similar thing as onFontChange
draw-style.service.ts
(Housecleaning: Change the variable for the properties of each features)
Bugs:
- When moving the drawing, it resets the color and the font
- When the user edits the label, it bugs the whole website
Might change the design of the page
Started playing with the design of the page
Need to clean the code and work on if it is an icon
Uses the length of the store ()
@pelord pelord merged commit 39179bb into next Nov 14, 2022
@PhilippeLafreniere18 PhilippeLafreniere18 deleted the DessinPlusieurCouches2.0 branch November 30, 2022 18:43
cbourget pushed a commit that referenced this pull request Mar 21, 2023
* Merge branch 'DrawingGestionOnLabels' into DessinGestionDesEtiquettes

* Progress in the selection of the element

   * In the store, each entities have their own style, but when applying the style,
   * the setStyle function does not recognize each entities
   *
   * TODO:
   *  Either redo the setStyle function to take in entities or find a
   *  way to change the features inside the store
   *
   *  When changing the label, set the style to the original style
   *
   *  Repeat this for all colors
   *
   *  Remove any useless things and add comments

* Working selection of an element for font size and font style

Need to do onColorChange

* TODO next week

draw.interface.ts:
	Add attributes for color stroke and color fill
draw.component.ts:
	Change the global variables of fillForm and strokeForm
	Create functions to return their color stroke and fill
	Do a similar thing as onFontChange
draw-style.service.ts
(Housecleaning: Change the variable for the properties of each features)

* Selection per element for the color works

Bugs:
- When moving the drawing, it resets the color and the font
- When the user edits the label, it bugs the whole website

* Working features

Might change the design of the page

* Partially clean it up

Started playing with the design of the page

* Implemented edition of the position of label

Need to clean the code and work on if it is an icon

* Cleaned up the code

* Added a CSS style for the edition of the draw

* removed unused code

* Initial scrollbar for the table

* Progress in table

* Update entity-table.component.html

* formatted the html

* format ts file

* Fixed some formatting issues

* Redid design of the inputs box

* updated format

* edit the formatting

* Update package-lock.json

* Implemented a possible solution

* Dynamic table height

Uses the length of the store ()

* Update to fit 6 elements of the table

* Cleaned up the code

* Reformatting

* reformating

* reformatting

* Redid the files since next

* UI modifications

* UI and logic changes

* 1.12.0

* Added a popup dialog

* Added the json lines for the layer

* Update draw.component.ts

* Changed the logic

* Still does not retain the info

* working logic with few bugs

* Made an Output and input for DC

* Working prototype

* Cleaning the code

* Update draw.component.ts

* Requested changes

* updateFrontend to getFeature

* Update draw.component.ts

* Fix bugs

* Update draw.component.ts

* formatting

* Added logic to the toggles

* small changes

* Changed some words

* fix merge error

* fix/feat(draw): minor fix + toggle visibility

* feat(draw): active drawing layer as an input allow to keep the default selection when destroy

Co-authored-by: Philippe Lafreniere <philippe.lafreniere@msp.gouv.qc.ca>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants