-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathCODING.html
1917 lines (1660 loc) · 61.8 KB
/
CODING.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<HEAD>
<META NAME="generator" CONTENT="http://txt2tags.org">
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<TITLE>QGIS</TITLE>
<!-- Included /home/fischer/src/qgis/doc/style.css -->
<STYLE TYPE="text/css">
body{ background: white;
color: black;
font-family: arial,sans-serif;
}
pre { margin-left: 2em;
border: 1;
padding: 4px;
background: #ececec; }
pre, code { font-family: monospace }
.overview{ font: 1.82em; font-weight: bold;}
h1{ background-color: #F6F6F6;
color: #8FB171;
font-size: large;
font-weight: bold;
font-family: luxi serif, georgia, times new roman, times, serif;
background: none;
padding: 0.75em 0 0;
margin: 0;
line-height: 1.1em;
border-bottom: 5px solid #DCEB5C;
}
h2{ background-color: #F6F6F6;
color: #8FB171;
font-size: large;
font-weight: normal;
font-family: luxi serif, georgia, times new roman, times, serif;
background: none;
padding: 0.75em 0 0;
margin: 0;
line-height: 1.1em;
}
h3{ background-color: #F6F6F6;
color: #729FCF;
font-family: luxi serif, georgia, times new roman, times, serif;
font-weight: bold;
font-size: medium;
}
h4{ background-color: #F6F6F6;
color: #729FCF;
font-family: luxi serif, georgia, times new roman, times, serif;
font-weight: normal;
font-size: medium;
}
h5{ background-color: #F6F6F6;
color: #729FCF;
font-family: luxi serif, georgia, times new roman, times, serif;
font-weight: bold;
font-size: small;
}
a{ color: #729FCF;
font-family: arial,sans-serif;
font-size: small;
}
label{ background-color: #FFFFCC;
border: 1px solid black;
margin: 1px;
padding: 0px 3px;
font-size: small;
}
</STYLE>
</HEAD>
<BODY>
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H3>Developers guide for QGIS</H3>
</DIV>
<DIV CLASS="toc">
<OL>
<LI><A HREF="#toc1">QGIS Coding Standards</A>
<UL>
<LI><A HREF="#toc2">1.1. Classes</A>
<UL>
<LI><A HREF="#toc3">1.1.1. Names</A>
<LI><A HREF="#toc4">1.1.2. Members</A>
<LI><A HREF="#toc5">1.1.3. Accessor Functions</A>
<LI><A HREF="#toc6">1.1.4. Functions</A>
</UL>
<LI><A HREF="#toc7">1.2. Qt Designer</A>
<UL>
<LI><A HREF="#toc8">1.2.1. Generated Classes</A>
<LI><A HREF="#toc9">1.2.2. Dialogs</A>
</UL>
<LI><A HREF="#toc10">1.3. C++ Files</A>
<UL>
<LI><A HREF="#toc11">1.3.1. Names</A>
<LI><A HREF="#toc12">1.3.2. Standard Header and License</A>
<LI><A HREF="#toc13">1.3.3. Keyword Substitution</A>
</UL>
<LI><A HREF="#toc14">1.4. Variable Names</A>
<LI><A HREF="#toc15">1.5. Enumerated Types</A>
<LI><A HREF="#toc16">1.6. Global Constants & Macros</A>
<LI><A HREF="#toc17">1.7. Editing</A>
<UL>
<LI><A HREF="#toc18">1.7.1. Tabs</A>
<LI><A HREF="#toc19">1.7.2. Indentation</A>
<LI><A HREF="#toc20">1.7.3. Braces</A>
</UL>
<LI><A HREF="#toc21">1.8. API Compatibility</A>
<LI><A HREF="#toc22">1.9. Coding Style</A>
<UL>
<LI><A HREF="#toc23">1.9.1. Where-ever Possible Generalize Code</A>
<LI><A HREF="#toc24">1.9.2. Prefer Having Constants First in Predicates</A>
<LI><A HREF="#toc25">1.9.3. Whitespace Can Be Your Friend</A>
<LI><A HREF="#toc26">1.9.4. Use Braces Even for Single Line Statements</A>
<LI><A HREF="#toc27">1.9.5. Book recommendations</A>
</UL>
</UL>
<LI><A HREF="#toc28">GIT Access</A>
<UL>
<LI><A HREF="#toc29">2.1. Installation</A>
<UL>
<LI><A HREF="#toc30">2.1.1. Install git for GNU/Linux</A>
<LI><A HREF="#toc31">2.1.2. Install git for Windows</A>
<LI><A HREF="#toc32">2.1.3. Install git for OSX</A>
</UL>
<LI><A HREF="#toc33">2.2. Accessing the Repository</A>
<LI><A HREF="#toc34">2.3. Check out a branch</A>
<LI><A HREF="#toc35">2.4. QGIS documentation sources</A>
<LI><A HREF="#toc36">2.5. GIT Documentation</A>
<LI><A HREF="#toc37">2.6. Development in branches</A>
<UL>
<LI><A HREF="#toc38">2.6.1. Purpose</A>
<LI><A HREF="#toc39">2.6.2. Procedure</A>
</UL>
<LI><A HREF="#toc40">2.7. Submitting Patches and Pull Requests</A>
<UL>
<LI><A HREF="#toc41">2.7.1. Pull Requests</A>
<LI><A HREF="#toc42">2.7.2. Patch file naming</A>
<LI><A HREF="#toc43">2.7.3. Create your patch in the top level QGIS source dir</A>
<LI><A HREF="#toc44">2.7.4. Getting your patch noticed</A>
<LI><A HREF="#toc45">2.7.5. Due Diligence</A>
</UL>
<LI><A HREF="#toc46">2.8. Obtaining GIT Write Access</A>
</UL>
<LI><A HREF="#toc47">Unit Testing</A>
<UL>
<LI><A HREF="#toc48">3.1. The QGIS testing framework - an overview</A>
<LI><A HREF="#toc49">3.2. Creating a unit test</A>
<LI><A HREF="#toc50">3.3. Adding your unit test to CMakeLists.txt</A>
<LI><A HREF="#toc51">3.4. The ADD_QGIS_TEST macro explained</A>
<LI><A HREF="#toc52">3.5. Building your unit test</A>
<LI><A HREF="#toc53">3.6. Run your tests</A>
</UL>
<LI><A HREF="#toc54">Getting up and running with QtCreator and QGIS</A>
<UL>
<LI><A HREF="#toc55">4.1. Installing QtCreator</A>
<LI><A HREF="#toc56">4.2. Setting up your project</A>
<LI><A HREF="#toc57">4.3. Setting up your build environment</A>
<LI><A HREF="#toc58">4.4. Setting your run environment</A>
<LI><A HREF="#toc59">4.5. Running and debugging</A>
</UL>
<LI><A HREF="#toc60">HIG (Human Interface Guidelines)</A>
<LI><A HREF="#toc61">Authors</A>
</OL>
</DIV>
<DIV CLASS="body" ID="body">
<A NAME="toc1"></A>
<H1>1. QGIS Coding Standards</H1>
<P>
These standards should be followed by all QGIS developers.
</P>
<A NAME="toc2"></A>
<H2>1.1. Classes</H2>
<A NAME="toc3"></A>
<H3>1.1.1. Names</H3>
<P>
Class in QGIS begin with Qgs and are formed using mixed case.
</P>
<div class="code"><PRE>
Examples:
QgsPoint
QgsMapCanvas
QgsRasterLayer
</PRE></div>
<A NAME="toc4"></A>
<H3>1.1.2. Members</H3>
<P>
Class member names begin with a lower case <I>m</I> and are formed using mixed
case.
</P>
<div class="code"><PRE>
mMapCanvas
mCurrentExtent
</PRE></div>
<P>
All class members should be private.
<B>Public class members are STRONGLY discouraged</B>
</P>
<A NAME="toc5"></A>
<H3>1.1.3. Accessor Functions</H3>
<P>
Class member values should be obtained through accesssor functions. The
function should be named without a <I>get</I> prefix. Accessor functions for the
two private members above would be:
</P>
<div class="code"><PRE>
mapCanvas()
currentExtent()
</PRE></div>
<A NAME="toc6"></A>
<H3>1.1.4. Functions</H3>
<P>
Function names begin with a lowercase letter and are formed using mixed case.
The function name should convey something about the purpose of the function.
</P>
<div class="code"><PRE>
updateMapExtent()
setUserOptions()
</PRE></div>
<A NAME="toc7"></A>
<H2>1.2. Qt Designer</H2>
<A NAME="toc8"></A>
<H3>1.2.1. Generated Classes</H3>
<P>
QGIS classes that are generated from Qt Designer (ui) files should have a
<I>Base</I> suffix. This identifies the class as a generated base class.
</P>
<div class="code"><PRE>
Examples:
QgsPluginManagerBase
QgsUserOptionsBase
</PRE></div>
<A NAME="toc9"></A>
<H3>1.2.2. Dialogs</H3>
<P>
All dialogs should implement the following:
* Tooltip help for all toolbar icons and other relevant widgets
* WhatsThis help for <B>all</B> widgets on the dialog
* An optional (though highly recommended) context sensitive <I>Help</I> button
that directs the user to the appropriate help page by launching their web
browser
</P>
<A NAME="toc10"></A>
<H2>1.3. C++ Files</H2>
<A NAME="toc11"></A>
<H3>1.3.1. Names</H3>
<P>
C++ implementation and header files should be have a .cpp and .h extension
respectively. Filename should be all lowercase and, in the case of classes,
match the class name.
</P>
<div class="code"><PRE>
Example:
Class QgsFeatureAttribute source files are
qgsfeatureattribute.cpp and qgsfeatureattribute.h
</PRE></div>
<P>
/!\ <B>Note:</B> in case it is not clear from the statement above, for a filename
to match a class name it implicitly means that each class should be declared
and implemented in its own file. This makes it much easier for newcomers to
identify where the code is relating to specific class.
</P>
<A NAME="toc12"></A>
<H3>1.3.2. Standard Header and License</H3>
<P>
Each source file should contain a header section patterned after the following
example:
</P>
<div class="code"><PRE>
/***************************************************************************
qgsfield.cpp - Describes a field in a layer or table
--------------------------------------
Date : 01-Jan-2004
Copyright : (C) 2004 by Gary E.Sherman
Email : sherman at mrcc.com
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
</PRE></div>
<A NAME="toc13"></A>
<H3>1.3.3. Keyword Substitution</H3>
<P>
In the days of SVN we used to require that each source file should contain the
$Id$ keyword. Keyword substitution is not supported by GIT and so should no
longer be used.
</P>
<A NAME="toc14"></A>
<H2>1.4. Variable Names</H2>
<P>
Variable names begin with a lower case letter and are formed using mixed case.
</P>
<div class="code"><PRE>
Examples:
mapCanvas
currentExtent
</PRE></div>
<A NAME="toc15"></A>
<H2>1.5. Enumerated Types</H2>
<P>
Enumerated types should be named in CamelCase with a leading capital e.g.:
</P>
<div class="code"><PRE>
enum UnitType
{
Meters,
Feet,
Degrees,
UnknownUnit
};
</PRE></div>
<P>
Do not use generic type names that will conflict with other types. e.g. use
"UnkownUnit" rather than "Unknown"
</P>
<A NAME="toc16"></A>
<H2>1.6. Global Constants & Macros</H2>
<P>
Global constants and macros should be written in upper case underscore separated e.g.:
</P>
<div class="code"><PRE>
const long GEOCRS_ID = 3344;
</PRE></div>
<A NAME="toc17"></A>
<H2>1.7. Editing</H2>
<P>
Any text editor/IDE can be used to edit QGIS code, providing the following
requirements are met.
</P>
<A NAME="toc18"></A>
<H3>1.7.1. Tabs</H3>
<P>
Set your editor to emulate tabs with spaces. Tab spacing should be set to 2
spaces.
</P>
<P>
<B>Note:</B> In vim this is done with set expandtab ts=2
</P>
<A NAME="toc19"></A>
<H3>1.7.2. Indentation</H3>
<P>
Source code should be indented to improve readability. There is a
scripts/prepare-commit.sh that looks up the changed files and reindents them
using astyle. This should be run before committing. You can also use
<CODE>scripts/astyle.sh</CODE> to indent individual files.
</P>
<P>
As newer versions of astyle indent differently than the version used to do a
complete reindentation of the source, the script uses an old astyle version,
that we include in our repository (enable WITH_ASTYLE in cmake to include it in
the build).
</P>
<A NAME="toc20"></A>
<H3>1.7.3. Braces</H3>
<P>
Braces should start on the line following the expression:
</P>
<div class="code"><PRE>
if(foo == 1)
{
// do stuff
...
}
else
{
// do something else
...
}
</PRE></div>
<A NAME="toc21"></A>
<H2>1.8. API Compatibility</H2>
<P>
We try to keep the API stable and backwards compatible. Cleanups to the API
should be done in a manner similar to the Trolltech developers e.g.
</P>
<div class="code"><PRE>
class Foo
{
public:
/** This method will be deprecated, you are encouraged to use
doSomethingBetter() rather.
@deprecated doSomethingBetter()
*/
Q_DECL_DEPRECATED bool doSomething();
/** Does something a better way.
@note added in 1.1
*/
bool doSomethingBetter();
signal:
/** This signal will be deprecated, you are encouraged to
connect to somethingHappenedBetter() rather.
@deprecated use somethingHappenedBetter()
*/
#ifndef Q_MOC_RUN
Q_DECL_DEPRECATED
#endif
bool somethingHappened();
/** Something happened
@note added in 1.1
bool somethingHappenedBetter();
}
</PRE></div>
<A NAME="toc22"></A>
<H2>1.9. Coding Style</H2>
<P>
Here are described some programming hints and tips that will hopefully reduce
errors, development time, and maintenance.
</P>
<A NAME="toc23"></A>
<H3>1.9.1. Where-ever Possible Generalize Code</H3>
<div class="code"><PRE>
If you are cut-n-pasting code, or otherwise writing the same thing more than
once, consider consolidating the code into a single function.
</PRE></div>
<P>
This will:
</P>
<UL>
<LI>allow changes to be made in one location instead of in multiple places
<LI>help prevent code bloat
<LI>make it more difficult for multiple copies to evolve differences over time,
thus making it harder to understand and maintain for others
</UL>
<A NAME="toc24"></A>
<H3>1.9.2. Prefer Having Constants First in Predicates</H3>
<P>
Prefer to put constants first in predicates.
</P>
<div class="code"><PRE>
"0 == value" instead of "value == 0"
</PRE></div>
<P>
This will help prevent programmers from accidentally using "=" when they meant
to use "==", which can introduce very subtle logic bugs. The compiler will
generate an error if you accidentally use "=" instead of "==" for comparisons
since constants inherently cannot be assigned values.
</P>
<A NAME="toc25"></A>
<H3>1.9.3. Whitespace Can Be Your Friend</H3>
<P>
Adding spaces between operators, statements, and functions makes it easier for
humans to parse code.
</P>
<P>
Which is easier to read, this:
</P>
<div class="code"><PRE>
if (!a&&b)
</PRE></div>
<P>
or this:
</P>
<div class="code"><PRE>
if ( ! a && b )
</PRE></div>
<P>
<B>Note:</B> prepare-commit.sh will take care of this.
</P>
<A NAME="toc26"></A>
<H3>1.9.4. Use Braces Even for Single Line Statements</H3>
<P>
Using braces for code in if/then blocks or similar code structures even for
single line statements means that adding another statement is less likely to
generate broken code.
</P>
<P>
Consider:
</P>
<div class="code"><PRE>
if (foo)
bar();
else
baz();
</PRE></div>
<P>
Adding code after bar() or baz() without adding enclosing braces would create
broken code. Though most programmers would naturally do that, some may forget
to do so in haste.
</P>
<P>
So, prefer this:
</P>
<div class="code"><PRE>
if (foo)
{
bar();
}
else
{
baz();
}
</PRE></div>
<A NAME="toc27"></A>
<H3>1.9.5. Book recommendations</H3>
<UL>
<LI><A HREF="http://www.awprofessional.com/title/0321334876">Effective C++</A>, Scott Meyers
<LI><A HREF="http://www.awprofessional.com/bookstore/product.asp?isbn=020163371X&rl=1">More Effective C++</A>, Scott Meyers
<LI><A HREF="http://www.awprofessional.com/title/0201749629">Effective STL</A>, Scott Meyers
<LI><A HREF="http://www.awprofessional.com/title/0201634988">Design Patterns</A>, GoF
</UL>
<P>
You should also really read this article from Qt Quarterly on
<A HREF="APIs">http://doc.trolltech.com/qq/qq13-apis.html designing Qt style</A>
</P>
<A NAME="toc28"></A>
<H1>2. GIT Access</H1>
<P>
This section describes how to get started using the QGIS GIT repository. Before you can do this, you need to first have a git client installed on your system.
</P>
<A NAME="toc29"></A>
<H2>2.1. Installation</H2>
<A NAME="toc30"></A>
<H3>2.1.1. Install git for GNU/Linux</H3>
<P>
Debian based distro users can do:
</P>
<div class="code"><PRE>
sudo apt-get install git
</PRE></div>
<A NAME="toc31"></A>
<H3>2.1.2. Install git for Windows</H3>
<P>
Windows users can obtain <A HREF="http://code.google.com/p/msysgit/">msys git</A> or use git distributed with <A HREF="http://cygwin.com">cygwin</A>.
</P>
<A NAME="toc32"></A>
<H3>2.1.3. Install git for OSX</H3>
<P>
The <A HREF="http://git-scm.com/">git</A> project has a downloadable build of git.
Make sure to get the package matching your processor (x86_64 most likely, only the first Intel Macs need the i386 package).
</P>
<P>
Once downloaded open the disk image and run the installer.
</P>
<P>
<U>PPC/source note</U>
</P>
<P>
The git site does not offer PPC builds. If you need a PPC build, or you just want
a little more control over the installation, you need to compile it yourself.
</P>
<P>
Download the source from <A HREF="http://git-scm.com/">http://git-scm.com/</A>. Unzip it, and in a Terminal cd to the source folder, then:
</P>
<div class="code"><PRE>
make prefix=/usr/local
sudo make prefix=/usr/local install
</PRE></div>
<P>
If you don't need any of the extras, Perl, Python or TclTk (GUI), you can disable them before running make with:
</P>
<div class="code"><PRE>
export NO_PERL=
export NO_TCLTK=
export NO_PYTHON=
</PRE></div>
<A NAME="toc33"></A>
<H2>2.2. Accessing the Repository</H2>
<P>
To clone QGIS master:
</P>
<div class="code"><PRE>
git://github.com/qgis/QGIS.git
</PRE></div>
<A NAME="toc34"></A>
<H2>2.3. Check out a branch</H2>
<P>
To check out a branch, for example the release 1.7.0 branch do:
</P>
<div class="code"><PRE>
cd QGIS
git fetch
git branch --track origin release-1_7_0
git checkout release-1_7_0
</PRE></div>
<P>
To check out the master branch:
</P>
<div class="code"><PRE>
cd QGIS
git checkout master
</PRE></div>
<P>
/!\ <B>Note:</B> In QGIS we keep our most stable code in the current release branch.
Master contains code for the so called 'unstable' release series. Periodically
we will branch a release off master, and then continue stabilisation and selective
incorporation of new features into master.
</P>
<P>
See the INSTALL file in the source tree for specific instructions on building
development versions.
</P>
<A NAME="toc35"></A>
<H2>2.4. QGIS documentation sources</H2>
<P>
If you're interested in checking out QGIS documentation sources:
</P>
<div class="code"><PRE>
git clone [email protected]:qgis/QGIS-Documentation.git
</PRE></div>
<P>
You can also take a look at the readme included with the documentation repo for more information.
</P>
<A NAME="toc36"></A>
<H2>2.5. GIT Documentation</H2>
<P>
See the following sites for information on becoming a GIT master.
</P>
<P>
<A HREF="http://gitref.org">http://gitref.org</A>
<A HREF="http://progit.org">http://progit.org</A>
<A HREF="http://gitready.com">http://gitready.com</A>
</P>
<A NAME="toc37"></A>
<H2>2.6. Development in branches</H2>
<A NAME="toc38"></A>
<H3>2.6.1. Purpose</H3>
<P>
The complexity of the QGIS source code has increased considerably during the
last years. Therefore it is hard to anticipate the side effects that the
addition of a feature will have. In the past, the QGIS project had very long
release cycles because it was a lot of work to reetablish the stability of the
software system after new features were added. To overcome these problems, QGIS
switched to a development model where new features are coded in GIT branches
first and merged to master (the main branch) when they are finished and stable.
This section describes the procedure for branching and merging in the QGIS
project.
</P>
<A NAME="toc39"></A>
<H3>2.6.2. Procedure</H3>
<UL>
<LI><B>Initial announcement on mailing list:</B>
Before starting, make an announcement on the developer mailing list to see if
another developer is already working on the same feature. Also contact the
technical advisor of the project steering committee (PSC). If the new feature
requires any changes to the QGIS architecture, a request for comment (RFC) is
needed.
<P></P>
<B>Create a branch:</B>
Create a new GIT branch for the development of the new feature.
<P></P>
<div class="code"><PRE>
git branch newfeature
git checkout newfeature
</PRE></div>
<P></P>
Now you can start developing. If you plan to do extensive on that branch, would
like to share the work with other developers, and have write access to the
upstream repo, you can push your repo up to the QGIS official repo by doing:
<P></P>
<div class="code"><PRE>
git push origin newfeature
</PRE></div>
<P></P>
<B>Note:</B> if the branch already exists your changes will be pushed into it.
<P></P>
<B>Merge from master regularly:</B>
It is recommended to merge the changes in master to the branch on a regular
basis. This makes it easier to merge the branch back to master later.
<P></P>
<div class="code"><PRE>
git merge master
</PRE></div>
<P></P>
<B>Documentation on wiki:</B>
It is also recommended to document the intended changes and the current status
of the work on a wiki page.
<P></P>
<B>Testing before merging back to master:</B>
When you are finished with the new feature and happy with the stability, make
an announcement on the developer list. Before merging back, the changes will
be tested by developers and users.
</UL>
<A NAME="toc40"></A>
<H2>2.7. Submitting Patches and Pull Requests</H2>
<P>
There are a few guidelines that will help you to get your patches and pull
requests into QGIS easily, and help us deal with the patches that are sent to
use easily.
</P>
<A NAME="toc41"></A>
<H3>2.7.1. Pull Requests</H3>
<P>
In general it is easier for developers if you submit GitHub pull
requests. We do not describe Pull Requests here, but rather refer you to the
GitHub pull request documentation here:
</P>
<P>
<A HREF="https://help.github.com/articles/using-pull-requests">https://help.github.com/articles/using-pull-requests</A>
</P>
<P>
If you make a pull request we ask that you please merge master to your PR
branch regularly so that your PR is always mergable to the upstream master
branch.
</P>
<P>
If you are a developer and wish to evaluate the pull request queue, there is a
very nice tool that lets you do this from the command line described here:
</P>
<P>
<A HREF="http://thechangelog.com/git-pulls-command-line-tool-for-github-pull-requests/">http://thechangelog.com/git-pulls-command-line-tool-for-github-pull-requests/</A>
</P>
<P>
Please see the section below on 'getting your patch noticed'. In general when
you submit a PR you should take the responsibility to follow it through to
completion - respond to queries posted by other developers, seek out a
'champion' for your feature and give them a gentle reminder occasionally if you
see that your PR is not being acted on. Please bear in mind that the QGIS
project is driven by volunteer effort and people may not be able to attend to
your PR instantaneously. If you feel the PR is not receiving the attention it
deserves your options to accelerate it should be (in order of priority):
</P>
<P>
* Send a message to the mailing list 'marketing' your PR and how wonderful it
will be to have it included in the code base.
* Send a message to the person your PR has been assigned to in the PR queue.
* Send a message to Marco Hugentobler (who manages the PR queue).
* Send a message to the project steering committee asking them to help see your
PR incorporated into the code base.
</P>
<H4>2.7.1.1. Best practice for creating a pull request</H4>
<P>
* Always start a feature branch from current master.
* If you are coding a feature branch, don't "merge" anything in to that branch,
rather rebase as described in the next point to keep your history clean.
* Before you create a pull request do "git fetch origin" and "git rebase
origin/master" (given origin is the remote for upstream and not your own
remote, check your .git/config or do "git remote -v | grep github.com/qgis").
* You may do a "git rebase" like in the last line repeatedly without doing any
damage (as long as the only purpose of your branch is to get merged into
master).
* Attention: After a rebase you need to "git push -f" to your <B>forked repo</B>.
<B>CORE DEVS</B>: DO NOT DO THIS ON THE QGIS PUBLIC REPOSITORY!
</P>
<H4>2.7.1.2. For merging a pull request</H4>
<P>
Option A
</P>
<P>
* click the merge button (Creates a non-fast-forward merge)
</P>
<P>
Option B
</P>
<P>
* Checkout the pull request (See <A HREF="https://gist.github.com/piscisaureus/3342247">https://gist.github.com/piscisaureus/3342247</A>)
* Test (Also required for option A, obviously)
* checkout master, <CODE>git merge pr/1234</CODE>
* Optional: <CODE>git pull --rebase</CODE>: Creates a fast-forward, no "merge commit" is
made. Cleaner history, but it is harder to revert the merge.
* <CODE>git push</CODE>
</P>
<A NAME="toc42"></A>
<H3>2.7.2. Patch file naming</H3>
<P>
If the patch is a fix for a specific bug, please name the file with the bug
number in it e.g. <B>bug777fix.patch</B>, and attach it to the original bug report
in trac (<A HREF="http://hub.qgis.org/projects/quantum-gis">http://hub.qgis.org/projects/quantum-gis</A>).
</P>
<P>
If the bug is an enhancement or new feature, its usually a good idea to create
a ticket in trac (<A HREF="http://hub.qgis.org/projects/quantum-gis">http://hub.qgis.org/projects/quantum-gis</A>) first and then attach you
</P>
<A NAME="toc43"></A>
<H3>2.7.3. Create your patch in the top level QGIS source dir</H3>
<P>
This makes it easier for us to apply the patches since we don't need to
navigate to a specific place in the source tree to apply the patch. Also when I
receive patches I usually evaluate them using merge, and having the patch
from the top level dir makes this much easier. Below is an example of how you
can include multiple changed files into your patch from the top level
directory:
</P>
<div class="code"><PRE>
cd QGIS
git checkout master
git pull origin master
git checkout newfeature
git format-patch master --stdout > bug777fix.patch
</PRE></div>
<P>
This will make sure your master branch is in sync with the upstream repository,
and then generate a patch which contains the delta between your feature branch
and what is in the master branch.
</P>
<A NAME="toc44"></A>
<H3>2.7.4. Getting your patch noticed</H3>
<P>
QGIS developers are busy folk. We do scan the incoming patches on bug reports
but sometimes we miss things. Don't be offended or alarmed. Try to identify a
developer to help you - using the <A HREF="http://qgis.org/en/site/getinvolved/governance/organisation/governance.html#community-resources">Technical Resources</A> and contact them
asking them if they can look at your patch. If you don't get any response, you
can escalate your query to one of the Project Steering Committee members
(contact details also available in the Technical Resources).
</P>
<A NAME="toc45"></A>
<H3>2.7.5. Due Diligence</H3>
<P>
QGIS is licensed under the GPL. You should make every effort to ensure you only
submit patches which are unencumbered by conflicting intellectual property
rights. Also do not submit code that you are not happy to have made available
under the GPL.
</P>
<A NAME="toc46"></A>
<H2>2.8. Obtaining GIT Write Access</H2>
<P>
Write access to QGIS source tree is by invitation. Typically when a person
submits several (there is no fixed number here) substantial patches that
demonstrate basic competence and understanding of C++ and QGIS coding
conventions, one of the PSC members or other existing developers can nominate
that person to the PSC for granting of write access. The nominator should give
a basic promotional paragraph of why they think that person should gain write
access. In some cases we will grant write access to non C++ developers e.g. for
translators and documentors. In these cases, the person should still have
demonstrated ability to submit patches and should ideally have submitted several
substantial patches that demonstrate their understanding of modifying the code
base without breaking things, etc.
</P>
<P>
<B>Note:</B> Since moving to GIT, we are less likely to grant write access to new
developers since it is trivial to share code within github by forking QGIS and
then issuing pull requests.
</P>
<P>
Always check that everything compiles before making any commits / pull
requests. Try to be aware of possible breakages your commits may cause for
people building on other platforms and with older / newer versions of
libraries.
</P>
<P>
When making a commit, your editor (as defined in $EDITOR environment variable)
will appear and you should make a comment at the top of the file (above the
area that says 'don't change this'. Put a descriptive comment and rather do
several small commits if the changes across a number of files are unrelated.
Conversely we prefer you to group related changes into a single commit.
</P>
<A NAME="toc47"></A>
<H1>3. Unit Testing</H1>
<P>
As of November 2007 we require all new features going into master to be
accompanied with a unit test. Initially we have limited this requirement to
<B>qgis_core</B>, and we will extend this requirement to other parts of the code base
once people are familiar with the procedures for unit testing explained in the
sections that follow.
</P>
<A NAME="toc48"></A>
<H2>3.1. The QGIS testing framework - an overview</H2>
<P>