VirtualWatershed / prms-vegetation-scenarios

Online tool for PRMS modeling of multiple vegetation scenarios
BSD 3-Clause "New" or "Revised" License
0 stars 4 forks source link

fixed #19 #22

Closed ruiwu1990 closed 8 years ago

ruiwu1990 commented 8 years ago

Fixed #19

Users can select a single cell and separated rectangular areas by clicking and dragging. Users do not have to click the veg type button first and then select an area (the system will use the current chosen veg type code).

I don't know why my part cannot automatically merge this time...

mt-digital commented 8 years ago

@ruiwu1990 have you pulled the latest master into your fork? Please do that and note that I have removed chroma.js from the index and replaced it with the bower version. This might be part of the cause of the conflicts. It would help me if you could do this merge and fix the conflicts yourself. Then I will review your changes. Thanks!

ruiwu1990 commented 8 years ago

Sorry @mtpain I was a little busy today and just found the email. En.. I should fix this by myself. I will be faster next time. Rui