-
-
Notifications
You must be signed in to change notification settings - Fork 713
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
Updates for 3.0 #2258
Updates for 3.0 #2258
Conversation
as well as some fixes for consistency reasons and some details that have been missing so far. Needs a new screenshot for "Creating a new Shapefile layer dialog" that shows the "Geometries with Z coordinate" checkbox.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just one typo to change. Thanks Anita!
Empty, editable memory layers can be defined using :menuselection:`Layer --> | ||
Create Layer --> New Temporary Scratch Layer`. Here you can even create | ||
Empty, editable temporary scratch layers can be defined using :menuselection:`Layer --> | ||
Create Layer --> New Temporary Scratch Layer`. Here you can create |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here you can create
Too much space before create
@@ -319,8 +319,8 @@ The :guilabel:`DXF Export` dialog allows the user to: | |||
|
|||
.. _paste_into_layer: | |||
|
|||
Create layer from a clipboard | |||
============================= | |||
Createing new layers from the clipboard |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Creat*e*ing
-> Creating
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @anitagraser This is why we need more reviewers particularly when big parts of doc are restructured. It really looks better and consistent.
I would be interested in backporting this commit to 2.18 (because text looks better but also for URL consistency) and, except Z dimension, there's no incompatibility yet . Any objection?
|selectString| and :guilabel:`Date` |selectString| attributes are | ||
supported. Additionally, depending on the attribute type, you can also define | ||
the length and precision of the new attribute column. Once you are happy with the | ||
attributes, click **[OK]** and provide a name for the Shapefile. QGIS will |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This has changed: in the new dialog the user fills the shapefile's name at the beginning, not after he clicks ok.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I see the changes in master now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've updated the instructions.
saved and will be discarded when QGIS is closed. See also :ref:`paste_into_layer`. | ||
|radioButtonOff|:guilabel:`Polygon` layers. Temporary Scratch Layers only exist in | ||
memory. This means that they are not saved and will be discarded when QGIS is closed. | ||
See also :ref:`paste_into_layer`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if what temporary scratch layer is (and how it lives or dies) shouldn't be exposed before steps to create it… ie move these last sentences to the beginning
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
|radioButtonOff|:guilabel:`Multipoint`, |radioButtonOff|:guilabel:`Multiline` | ||
and |radioButtonOff|:guilabel:`Multipolygon` Layers beneath | ||
|radioButtonOn|:guilabel:`Point`, |radioButtonOff|:guilabel:`Line` and | ||
|radioButtonOff|:guilabel:`Polygon` Layers. Temporary Scratch Layers are not |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment actually concerns the not changed lines above: the spelling of geometry type has changed in recent commits, eg MultiPolygon instead of Multipolygon.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Forgot to say that it's no longer radio buttons but all in a combobox
Joins and complex queries can also be created simply by directly using the | ||
names of the layers that are to be joined. | ||
Joins and complex queries can also be created, for example, to join airports | ||
and county information: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
county or country? (see the sample code)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, should be country, but doesn't really matter.
@DelazJ Thanks and sure feel free to backport any part that's appropriate for 2.18. |
As far as I can see, all requested changes have now been addressed. Thank you for reviewing! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some more comments
|
||
|
||
.. index:: Save layer | ||
.. _general_saveas: | ||
|
||
Save layer from an existing file | ||
================================ | ||
Creating new layers from an existing layers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
An existing layer
@@ -163,35 +163,38 @@ predefined structure. | |||
Creating a new Temporary Scratch Layer | |||
-------------------------------------- | |||
|
|||
Empty, editable memory layers can be defined using :menuselection:`Layer --> | |||
Create Layer --> New Temporary Scratch Layer`. Here you can even create | |||
Temporary Scratch Layers only exist in memory. This means that they are not saved |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@anitagraser could you please review #2260? I included some changes in this section that i forgot to propose here. It'd be nice to harmonize this description to avoid double work for translation team.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've integrated your changes here.
The first step is to provide a path and name for the Shapefile. QGIS will | ||
automatically add the :file:`.shp` extension to the name you specify | ||
Next, choose the type of layer (point, line or polygon) and optional Z or M | ||
dimensions, as well as the CRS (coordinate reference system). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should it be Coordinate Reference System (ie titled)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you usually write it in title case? It's not a name, so I'd usually keep it in lower case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question! Never paid attention to it. I can see both spelling but i think you are not wrong writing it in lower case
First of all, let me stress again that i approve changes in this PR and agree that they add consistency, hence improvements. This is the way we need to go.
So, what to do? I can see two options (there might be others):
Voilà my last call on what looks like an issue to me but i could be wrong. A lot has already been done; it'd be a pity to lose those missing bits. And sorry for the length (i wanted it as documented as possible - aren't we in Docs repo?). |
Thank you for the explanations @DelazJ! I wasn't aware that the QGIS help system relies on headings rather than anchors. Sound to me like anchors are the way to go. |
@rduivenvoorde anything wrong with the build? The latest commit shouldn't have failed. |
@DelazJ all is ok now isn't it? Travis had troubles receiving Python apparently (nothing to do with the commits). But next build was ok. |
@m-kuhn @alexbruy @rduivenvoorde @SrNetoChan @ghtmtt @wonder-sk About the searching for any doc url's in the QGIS source files: Martin was proposing a long time ago that we should have an (ini?) file containing 'key' to 'url's. This indirection would make it easier to:
Is this something to consider? |
@rduivenvoorde Could we also grep the sources for |
@m-kuhn isn't it what is done in the aforementioned script from @jgrocha ? (unless I misunderstand) |
Oh, yes, pretty much :) |
@m-kuhn yep, except that the ini file could be maintained and controlled by documentation team: |
I see. Why not doing that on the server? Less deploy problems. And easy to do with mod rewrite etc. |
@m-kuhn It is not easy to do. I'll show you our current server configs if you want. Please do not force more rewrites, redirects, etc etc etc etc Else forget the idea. If at least we check the url's in feature freeze so for every release they are all valid. |
Sorry for claiming that it's easy, I admit I don't know about the server setup and I'm sure that everything behind is not a simple task. You are doing a great job with maintaining this. |
as new first class citizen
From a documentation writer's perspective, it would feel more empowering if changes in the documentation structure could be made without bothering with the actual software sources. |
About getting more people writing documentation, I have been preparing a PR to make the figures show in github rst preview. I am hoping to have some discussion around the inline substituitions, please comment if you have any concerns or ideas. Anyway, about the "Grepping", we need to remember that not everything can be done on github. There is no conflicts management, it's not possible to upload/edit new files. So we will always need to "grepping" guys that can manage that for others writers. I am ok with it. |
Regarding the helping system, even using the sphinx anchors I would like to explore the idea of the {key : value} ini file as a one place to maintain. One of the problems that we may have is not having certain sections of the documentation ready by the time of QGIS release, therefore, we won't know what link anchor to use in the application side. @alexbruy could the QGIS aplication rely on this key value file (editable on the documentation side) to redirect the user to the right section? This way we could update that file when needed. |
I totally agree that doc writers should not bother with the app sources nor have to use grep or other command line tools anywhere. |
Following up on this, none of the approaches outlined in here would require such a manual step. In general I think the following system should allow for minimal manual effort while having a good overview of the status:
|
@m-kuhn @rduivenvoorde thanks for this brainstorming. What/when would then be the next step? |
Let's move ahead and clean pr queue |
Thanks Anita |
as well as some fixes for consistency reasons and some details that have been missing so far.
Needs a new screenshot for "Creating a new Shapefile layer dialog" that shows the "Geometries with Z coordinate" checkbox.
Fix #1937
ref #2252 (miss a screenshot)