mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-26 00:02:08 -05:00
scalebar
git-svn-id: http://svn.osgeo.org/qgis/trunk@3024 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
rabla
parent
fa1e3fd86b
commit
36ab1624b6
@ -54,6 +54,7 @@ headers = qgisapp.h \
|
||||
qgscomposermap.h \
|
||||
qgscomposervectorlegend.h \
|
||||
qgscomposerlabel.h \
|
||||
qgscomposerscalebar.h \
|
||||
qgscomposerview.h \
|
||||
qgscomposition.h \
|
||||
qgscontcoldialog.h \
|
||||
@ -154,6 +155,7 @@ qgis_UIC = qgisappbase.ui \
|
||||
qgscomposermapbase.ui \
|
||||
qgscomposervectorlegendbase.ui \
|
||||
qgscomposerlabelbase.ui \
|
||||
qgscomposerscalebarbase.ui \
|
||||
qgscontcoldialogbase.ui \
|
||||
qgsdelattrdialogbase.ui \
|
||||
qgsdlgvectorlayerpropertiesbase.ui \
|
||||
@ -170,7 +172,6 @@ qgis_UIC = qgisappbase.ui \
|
||||
qgsmarkerdialogbase.ui \
|
||||
qgsmessageviewer.ui \
|
||||
qgsmeasurebase.ui \
|
||||
qgsvectorsymbologywidgetbase.ui \
|
||||
qgsoptionsbase.ui \
|
||||
qgspatterndialogbase.ui \
|
||||
qgspluginmanagerbase.ui \
|
||||
@ -184,6 +185,8 @@ qgis_UIC = qgisappbase.ui \
|
||||
qgsfillstylewidgetbase.ui \
|
||||
qgslinestylewidgetbase.ui
|
||||
|
||||
# qgsvectorsymbologywidgetbase.ui \
|
||||
|
||||
## all the ui files generate a corresponding header file
|
||||
qgis_UIHEADERS = $(qgis_UIC:.ui=.uic.h)
|
||||
|
||||
@ -219,6 +222,7 @@ qgis_MOC = qgisapp.moc.cpp \
|
||||
qgscomposermap.moc.cpp \
|
||||
qgscomposervectorlegend.moc.cpp \
|
||||
qgscomposerlabel.moc.cpp \
|
||||
qgscomposerscalebar.moc.cpp \
|
||||
qgscomposerview.moc.cpp \
|
||||
qgsattributetabledisplay.moc.cpp \
|
||||
qgscoordinatetransform.moc.cpp \
|
||||
@ -243,7 +247,6 @@ qgis_MOC = qgisapp.moc.cpp \
|
||||
qgsmapserverexport.moc.cpp \
|
||||
qgsmarkerdialog.moc.cpp \
|
||||
qgsmeasure.moc.cpp \
|
||||
qgsvectorsymbologywidget.moc.cpp \
|
||||
qgsoptions.moc.cpp \
|
||||
qgspatterndialog.moc.cpp \
|
||||
qgspluginmanager.moc.cpp \
|
||||
@ -262,6 +265,7 @@ qgis_MOC = qgisapp.moc.cpp \
|
||||
qgslinestylewidget.moc.cpp \
|
||||
splashscreen.moc.cpp
|
||||
|
||||
# qgsvectorsymbologywidget.moc.cpp \
|
||||
|
||||
qgis_SOURCES = main.cpp \
|
||||
qgisapp.cpp \
|
||||
@ -284,6 +288,7 @@ qgis_SOURCES = main.cpp \
|
||||
qgscomposermap.cpp \
|
||||
qgscomposervectorlegend.cpp \
|
||||
qgscomposerlabel.cpp \
|
||||
qgscomposerscalebar.cpp \
|
||||
qgscomposerview.cpp \
|
||||
qgscontcoldialog.cpp \
|
||||
qgscontinuouscolrenderer.cpp \
|
||||
@ -320,7 +325,6 @@ qgis_SOURCES = main.cpp \
|
||||
qgsmarkerdialog.cpp \
|
||||
qgsmarkersymbol.cpp \
|
||||
qgsmeasure.cpp \
|
||||
qgsvectorsymbologywidget.cpp \
|
||||
qgsoptions.cpp \
|
||||
qgspatterndialog.cpp \
|
||||
qgspluginitem.cpp \
|
||||
@ -363,6 +367,8 @@ qgis_SOURCES = main.cpp \
|
||||
qgsfillstylewidget.cpp \
|
||||
splashscreen.cpp
|
||||
|
||||
# qgsvectorsymbologywidget.cpp \
|
||||
|
||||
postgresHEADERS = qgsdbsourceselect.h \
|
||||
qgsnewconnection.h \
|
||||
qgspgquerybuilder.h \
|
||||
@ -422,6 +428,10 @@ libqgis_la_SOURCES = \
|
||||
qgscomposerlabel.moc.cpp \
|
||||
qgscomposerlabelbase.uic.cpp \
|
||||
qgscomposerlabelbase.moc.uic.cpp \
|
||||
qgscomposerscalebar.cpp \
|
||||
qgscomposerscalebar.moc.cpp \
|
||||
qgscomposerscalebarbase.uic.cpp \
|
||||
qgscomposerscalebarbase.moc.uic.cpp \
|
||||
qgscomposermap.cpp \
|
||||
qgscomposermap.moc.cpp \
|
||||
qgscomposermapbase.uic.cpp \
|
||||
@ -495,11 +505,12 @@ libqgis_la_SOURCES = \
|
||||
qgslinestylewidget.cpp \
|
||||
qgslinestylewidget.moc.cpp \
|
||||
qgsfillstylewidget.cpp \
|
||||
qgsfillstylewidget.moc.cpp \
|
||||
qgsvectorsymbologywidgetbase.uic.cpp \
|
||||
qgsvectorsymbologywidgetbase.moc.uic.cpp \
|
||||
qgsvectorsymbologywidget.cpp \
|
||||
qgsvectorsymbologywidget.moc.cpp
|
||||
qgsfillstylewidget.moc.cpp
|
||||
|
||||
# qgsvectorsymbologywidgetbase.uic.cpp \
|
||||
# qgsvectorsymbologywidgetbase.moc.uic.cpp \
|
||||
# qgsvectorsymbologywidget.cpp \
|
||||
# qgsvectorsymbologywidget.moc.cpp
|
||||
|
||||
|
||||
if HAVE_POSTGRESQL
|
||||
|
||||
@ -590,6 +590,7 @@ void QgsComposer::setToolActionsOff(void)
|
||||
actionAddMap->setOn ( false );
|
||||
actionAddVectorLegend->setOn ( false );
|
||||
actionAddLabel->setOn ( false );
|
||||
actionAddScalebar->setOn ( false );
|
||||
}
|
||||
|
||||
void QgsComposer::selectItem(void)
|
||||
@ -620,6 +621,13 @@ void QgsComposer::addLabel(void)
|
||||
actionAddLabel->setOn ( true );
|
||||
}
|
||||
|
||||
void QgsComposer::addScalebar(void)
|
||||
{
|
||||
mComposition->setTool ( QgsComposition::AddScalebar );
|
||||
setToolActionsOff();
|
||||
actionAddScalebar->setOn ( true );
|
||||
}
|
||||
|
||||
void QgsComposer::moveEvent ( QMoveEvent *e ) { saveWindowState(); }
|
||||
void QgsComposer::resizeEvent ( QResizeEvent *e ) { saveWindowState(); }
|
||||
|
||||
|
||||
@ -128,6 +128,9 @@ public slots:
|
||||
|
||||
//! Add new label
|
||||
void addLabel(void);
|
||||
|
||||
//! Add new scalebar
|
||||
void addScalebar(void);
|
||||
|
||||
//! read project
|
||||
void projectRead();
|
||||
|
||||
@ -232,6 +232,7 @@
|
||||
<action name="actionSelectItem"/>
|
||||
<action name="actionAddMap"/>
|
||||
<action name="actionAddVectorLegend"/>
|
||||
<action name="actionAddScalebar"/>
|
||||
<action name="actionAddLabel"/>
|
||||
</toolbar>
|
||||
<toolbar dock="2">
|
||||
@ -426,6 +427,20 @@
|
||||
<string>Export as SVG</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
<cstring>actionAddScalebar</cstring>
|
||||
</property>
|
||||
<property name="toggleAction">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image12</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add new scalebar</string>
|
||||
</property>
|
||||
</action>
|
||||
</actions>
|
||||
<images>
|
||||
<image name="image0">
|
||||
@ -459,11 +474,14 @@
|
||||
<data format="XPM.GZ" length="1547">789c6dd3d96e9b401805e07b3f05327751450cc62caa7a917d7742f6a4eac5cfcc6067b1931067adfaee9d73c0d84e3bc7b2f8741806067b79c9b93c3a7096965bcf1399dc28470da57496f4cb68f4f1f3d78fdfad761038f613058edffed66abb8e72fa0f6383e3cc1ebb1d0e302605014bb01b2160874c11b0471608e8836107012392033c236304ec9305027a60af8380011921a002638380395920e0219874e330e2c90760da4bc298dc05c54f8384b7b145c6699a68708d4c539d76c17732b7a727e013a9244c79f288d4120bb7f1aaa60d78411a49850bdd928588f0368a9a5a72f0baa60d780ee6be0d1fdf90010276c9100143b2878097648480fba45d28e55e6d83aa9727a2c0533241c075d2d89e27ef803a5571ce7683d4da577c6547a00910f093cc4da8397793543a57e407698c18cebd018b8ed1868fbf42fa26d2dc3a5d110187648080ab646862cdb9033242c0373236caf00dbe9289bd367fc08f643ae50b2945af5ae89ecca77ca81955eb9e90cafeca78e5494dbbb7e01da92df95f18d75455bb57d3063c260d7af0b9a60d282407ff0b9ee7722c1cd48d30dedc51ddc8d75137ae48be309416b76a3cc9cdfc28069edbcc31c3d9b8b995f939c3668dbbfb912ccc9916e387c7a7e91caf995396cf9397d7b77799ddf5b491f2e3736575ed7f8d94eb1b9b5bf3cfd334526eefeceefd736f25bff60f06fd2ff7366623e5e1d1205b98737c5235529e9e655933c798f3e2824d966597a75533db6bdb64f67375ddf1b3f9f7138857966cba7ed3f04ddad7d2b797b255d88baa75a643dcac6ae22c5b6cecc89af1b59955ed3fdf5b7f01ac568145</data>
|
||||
</image>
|
||||
<image name="image10">
|
||||
<data format="XPM.GZ" length="3182">789cad96c96edc461040effa8a81eb6604e5e13e83200749b62559d6665bb2ec2087e6a67d9dd11ae4dfd3f58a19403a043984cf06fc5c4db2bbbaba38efde8e0e77b7466fdf2dcde6617ed28c9ae3703b7adbde5d5c3cfdfec76f7f2ebd49ca117fc6a3f4cd2f4b6ff6e6a366b47d75d999a84491840befcdd3dcc03bbc30f0f6951f996795611ede13af0ce257c44b030f786e309e78de19c41bbc30cce5cb2b5fc34b039f9917ad811f9b97a9c1f3f2c1e304781ff3cf2b83f82ef1b22c4a9fcf25cf0b06f155e25303af898f0dc67b9c09e12b7861e0cbc3f3e3853fe313037fc283813fe28d813f98576303bfc759007e8773e1737c6ae0e4a76a0cfc16ef0dfcc67c9218f8351e0cd68bb37cdf3ff21b3203275ff5387481e7cb57c66706be8e1706cefc989ee7bfc08381eff1fcda603cfb374d0de2e72fe37a8a37067e86b7067e31ccaf1ffc8438174ebdd65cac9f7a8fab891027df2d174ebebbc4c0594f5718cc977a4e9a6ca83fe1fd69926585afa719ce439df37ea17eb226ef4bde27cb5e9f4551b23f42bd16493c6e5eef5e5fe369d2923fb9f47a9b66bde79bfa8c8731af7cfcf5502f89d793a47867e07b2ff75f323c35f08f7861e0e42b166f3ef17a643d93cac079ff848bf153bc36f0ef786be013bc3770cee33431f0ada1fe2aaf3fa95ed68f1ce01303dfc4b9f0f2657d09e76b5a1becdfb67b5d0cf9dcc71b03a7bea69d817fc27b83fb595f181bc4795e48c2d8e3c2f90da9812b9e1bdccffa69379e5fafbf2ae2ebbd5fb89f971df7ba6dbdde7fe29318f7e7911f96ebeb4f5ed6bb14afced7b757f5beecde949d9f07fa753c3d11e22bee31eef979f2f365e01b786a307e8c67115fffcec2bd5e394f7561e09cdfba3470ce6b5d193c8ffda49cbc7ffaf9ee0ce2d443dd1bdccffb9bb18193af268d78bf3b5f38f30b7c0f9bcc60fc073c37f0cf7811dde337834778ff0f7c12f1f370ba70af4ffa2fe5e5df13ea8df6e5fd88fd6a6a83f17c8f1b2e9e473e9ad6c0a9a7a633b87feb1f6f7dbdbebe3e8ef7f99c0d1e613cfbdf8e0dc633ff36f9c7757df008f7d3fff9dcfa7ae9f76d69e0d47b5b198ce7f7413b3588d37f62732e5baf87e7c127ade7f7106fdabaf5f51f0dde78bd4b58f463cf47ffaa3fafbdeacfcf0bf7ef15fda74b0d9cfdecb2883bbf37f839e2e7897ed8955dd67abea877daa7af7773e15e9ff44bda85af97f3c0f1f2fde57bdc8f0d9c7ed227067eb8709f0ffdaacf0d9cfae90b837c50af7d6910a71e694ffe7eeab7e732df9bff3bff758c8a06adb5d1563bedf5488ff5444ff54ccff5422ff58a31d77aa3b73ad3b9dee9bd3ec47f3dc6bf4ffaaccbbaa2abfefdd50f71d44c3fea9aaeeb867e8affdad4cfbaa5dbbaa3bbfe9b40bfe857fda6fb7aa0dff5507fe84f1d6b12ff2fd54c3d2f85965ae944a7a22212a496465ae9745f7a3992631f23275ac5f8a99ce9a39ccb855cca955ccb4de45666e4732e77722f0ff2284f3a93675996155995f7f221def751d618b32e1b3a914fb2298f71669bf259b6645b76f44076654fbe30e6ab7c8b4fd99703f91edfba2687f2437eca581249251bc6e452c4f99652c944a67217546e83f5ea5af6623bf0f3dde946ecbd47e158d7c349380d67d2eb7e380f1770c998ab701d6ec26d988579b80bf7e1213c86a7f01c96c34a580defffb77dffebd7a5bf017df1e33a</data>
|
||||
<data format="XPM.GZ" length="3006">789cad96c76e1c471040effc8a85ea2618a59d3c0bc3072a50a298493148860f3d8939ef8a2205ffbbbb5e8df668f8e07914c0c7eae9e950d5ad37af2727bb5b93d76f561ee7617ede4edab3f03079dd2daeaf9ffffceb8f9f2baf9272623ff96c92befa6de5d5de7cd24eb66f6f7a13952892f098cb15de66694963b9304f932c2b1adaf7786ee01d5e18e6e111af0ce2c13ccb0dfc062f0dfa97d19b3c101ff0ca20fe82b7f950fa785bf3bc3088bfc74b03aff0cac07fb8174539303ec69ff706fd35e6c5d4a03de32d92381dfa0bccaf0806f13bbc33f067f3723a4b3aff1efd976939ae9f26a3c729d2df03ce80f17bbc3078ffd27d960db4d76dbc8c716f7f377a7cf05bbc3668ff169f19c459ef3218f835de1a38fb5d4d0dbeaf781697cfd793f6d192b1fde5e8119cfca878f0737c66e067786bd0df09de1bc44ff1c120ce7cebc4c0bfe2a981bfc30b035fc5cb3aaf7dfc255e197881f3f03df2ab0e0671f6a76e0cfc00ef0c7c8a0f06be653e4b0cfc1b9e1af80e9e19f807bc30d81ff68bedf1f5fd3c7a353af9c0f2f9f8f7f1dac03fe13cf497e2c120bec01b83f8a67b538cf9b987b706cefacf7a03ff880f06efb39e616a10dfc09330f5b8ccf1d4a03dfd85ccc0a9c7901b38fb4139f9fe517fa18af8fc1f97eee7c7967bd3758c578ff13ac6bdbf1c670170f22df0e0e46b680c9cfc0cad8193bfa133f8fe2ede1bc45fdcdbb2f7fcf0ef0d06f155f718f7fea897661adf77bf1a7d18fbffee6ee06b786ad09efa68b288e7d3e6d23d9f383f9ac2c0996f531a38f9dd5406fd6538098e533f0d0ff5c079daf40671f2bf190cfa63bddba9811fe16984fc0fcdd27dbc7cafcd0c9cf3a8cd0d7c1d2fa27bfc66f408dff7feeb889f27b274cf7fea87f4f5fda63ed84edf6fce8bb63168cffc5a1efae37c6b3b8338f5d3f606ef6ffcf2cee74bbeb4436cefe309a347684f3d755383f68778f2cb756df408f119ce05429c7ceb4a03273fbacaa07d8dcf0ce29c373159cbced7fb69f4baf3f5fd82b75dd3f9fcbbd1dbb17efcfbf6b82f96ce7a28f5dc2706febc74af67faef5303e7fceab3883be71fd7abd727f5dc1706ce79da977dd6f9fa713f731df8fcd797eef9cbf9c9f1e4f3e77ca23c7dbfa987616ae09c8f4362e0874bf7f1b15e436ee09cb74361e0acf7501a38f72dc7a17f9fff6f0c3ce67bf37fe7bfb651d1a08db6da457a1df454cff45c2ff452aff45a6ffceed03bbdd7077dd4b92ef47bfced29fefba1cffaa2abfad6eb5bdfc7560ffa21b659d38ffa29feb6ae9f754337754bb7fd4cd41dddd53dddd703fda2877aa4c77aa25fe3dfbee9547ddd52cd34d7424badb4d699a8880469745f5ae9c46b259521b6a9e454cef449cee5422ee54aaee526722b777e9fc9833cca5c1612c72b4ff2439ee54556e56d7cef9dbcf73b52d6b4908ff249167164ebb22e9f654336f540b6645bfd9eda91ddd8cb9eeccb41fcea5cbec8a11cc9b19ec9897c1ddb7c8b332be3a8ee652a49fc6e1a4791492e856c4b295e4fbb714d1652cb4cd78286785348abfbf176f023841a88a935c876380d67e13c5c84cb7015aec34db80d77e13e3c84c7ff6ddffffe7de51fb271b6ad</data>
|
||||
</image>
|
||||
<image name="image11">
|
||||
<data format="XPM.GZ" length="424">789c8590c10ac2300c40effd8ad0de8a741d8817f113148f827848aa450f5398f320e2bf9b743a4b15164ac97b3469d3cac266bd045ba96b87dd294038620b767f6b9afb76b778285dcf80d7146a3d51da4180d5e57c90dc706e3c478c82d8638cde0b92a0408fae885167383287a2643783232221cc6a89897e1ca379abd2a54b3efd86735f27d2a4d2cc3942f7d7156f4e1df3d928b9625e1963e45f9e73f50245ae549e</data>
|
||||
</image>
|
||||
<image name="image12">
|
||||
<data format="XPM.GZ" length="2365">789c9dd4c96e1b391006e0bb9f42306f4650e9269b1b0673c8bedab1b23a0972282eed557662cb499cc1bcfb74ffd5f09c222b0605481faac82e16d9babb35dbdbdd9e6dddddb858f2f230cff2019fcfb6cae56271f5f9cbdfff6c6c6a3d1b3e3ecef4e69d8dcdf97296673b67a775843a1aa01ad3b886e10cb38e06717a0727c3b683bbc969f2155cdaae95f50e27db36c33d5ca34b123f817bcbbe60fe5b71a8c9217e3cba6d5c8d065e887d65c4e9056c8ce902fc5cec42c0f3c888439f3cfc461cfdf4fc0378a85663beda87add7519e5f611f63ea31ff191cfdb002e205aedec508a7d1ba1de64b3f7ec14e27836693863d3759f64370669d25ff1e5c8c36b29f0bb8379d49308f36cd38305fec8265ac47164eb6751257e210d822fe7a74d772ca385ff2b0bd8e3f8539f42ccf43bfbb6cb5957a225cb8cfd2df9f700d95258ef31db2d9b5700bbbd415d4430ef6a14ce787fedae4862dc001ae9193f4ab11275fc4e7a39dbe8ee3bc5ce7a293fb89fe3b3b58ea9bc3399522fdc579b9e2fb20f70de7efaad75eead91ded4daa53fe27d8e5a648fc091cb39e7c0ab3cf41f6877e87661cf06358675be4febd874deca2d4f703eeb22bb27fbc0fc1b19beeeb1e3c2c5fe4bc3ec235e722f5df87fb1858fafd4a9cb9c8f98d2fb78a3ada28f35fc2991d4bbfbec1b53455eafd3e9a870b58653dbcff6c39b1dcff47b0cfb1c87dc1fbcd21f519f79f3ec07c3dff6c746a867aa49f3b705b42155fc23ad769fff8ff49b698a97ebcff29143bd5f715e652aaf4ffe1e8dc165b643f0fe0ae74d3fc6db8af5dcdf267b7feb84d3ea971cc97abbfc75fb75b7f588145377dff9f7fd3f8ddfa53adbff16dd7bf5dff2951a642957ada5f2bff800ee9888ee984166be59fd2197da56f744e176be52fe992bed30ffa4957f48beeadcaa7fbf4801ed2237a4c4fe8293da3e7f46265fe4bdaa61d7a45bb34a7d7f486ded2bb95f9efe903edd147fa440db5a4c950b732df92234f81e2709c4ab14a2adfb4dff952155555aff6d5813a54476be41f0fd9bd3a5eef7c87fc13b518c6c9baf9378f3fcefff7af8dff00e41c7297</data>
|
||||
</image>
|
||||
</images>
|
||||
<connections>
|
||||
<connection>
|
||||
@ -538,6 +556,12 @@
|
||||
<receiver>QgsComposerBase</receiver>
|
||||
<slot>image()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>actionAddScalebar</sender>
|
||||
<signal>activated()</signal>
|
||||
<receiver>QgsComposerBase</receiver>
|
||||
<slot>addScalebar()</slot>
|
||||
</connection>
|
||||
</connections>
|
||||
<slots>
|
||||
<slot>fileNew()</slot>
|
||||
@ -556,6 +580,7 @@
|
||||
<slot>selectItem()</slot>
|
||||
<slot>image()</slot>
|
||||
<slot>svg()</slot>
|
||||
<slot>addScalebar()</slot>
|
||||
</slots>
|
||||
<layoutdefaults spacing="6" margin="11"/>
|
||||
</UI>
|
||||
|
||||
@ -402,6 +402,8 @@ bool QgsComposerMap::selected( void )
|
||||
return mSelected;
|
||||
}
|
||||
|
||||
double QgsComposerMap::scale ( void ) { return mScale; }
|
||||
|
||||
QWidget *QgsComposerMap::options ( void )
|
||||
{
|
||||
setOptions ();
|
||||
|
||||
@ -113,6 +113,9 @@ public:
|
||||
/** \brief Font size scale */
|
||||
double fontScale ( void );
|
||||
|
||||
/** \brief Scale */
|
||||
double scale ( void );
|
||||
|
||||
public slots:
|
||||
// Called by GUI if with or height was changed
|
||||
void sizeChanged ( void );
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
#include "qgscomposermap.h"
|
||||
#include "qgscomposervectorlegend.h"
|
||||
#include "qgscomposerlabel.h"
|
||||
#include "qgscomposerscalebar.h"
|
||||
|
||||
QgsCompositionPaper::QgsCompositionPaper ( QString name, int w, int h, bool c)
|
||||
{
|
||||
@ -302,6 +303,24 @@ void QgsComposition::contentsMousePressEvent(QMouseEvent* e)
|
||||
mComposer->showItemOptions ( lab->options() );
|
||||
mSelectedItem = dynamic_cast <QCanvasItem*> (lab);
|
||||
|
||||
mCanvas->update();
|
||||
}
|
||||
break;
|
||||
|
||||
case AddScalebar:
|
||||
{
|
||||
mNewCanvasItem->setX( p.x() );
|
||||
mNewCanvasItem->setY( p.y() );
|
||||
QgsComposerScalebar *sb = dynamic_cast <QgsComposerScalebar*> (mNewCanvasItem);
|
||||
mItems.push_back(sb);
|
||||
mNewCanvasItem = 0;
|
||||
mComposer->selectItem(); // usually just one ???
|
||||
|
||||
// Select and show options
|
||||
sb->setSelected ( true );
|
||||
mComposer->showItemOptions ( sb->options() );
|
||||
mSelectedItem = dynamic_cast <QCanvasItem*> (sb);
|
||||
|
||||
mCanvas->update();
|
||||
}
|
||||
break;
|
||||
@ -321,8 +340,14 @@ void QgsComposition::contentsMouseMoveEvent(QMouseEvent* e)
|
||||
double x,y;
|
||||
mView->inverseWorldMatrix().map( e->pos().x(), e->pos().y(), &x, &y );
|
||||
|
||||
mSelectedItem->setX( mSelectedItem->x() + x - mLastX );
|
||||
mSelectedItem->setY( mSelectedItem->y() + y - mLastY );
|
||||
// TODO better move
|
||||
if ( typeid (*mSelectedItem) == typeid(QgsComposerScalebar) ) {
|
||||
QgsComposerScalebar *sb = dynamic_cast<QgsComposerScalebar *> (mSelectedItem);
|
||||
sb->move ( (int)(mSelectedItem->x() + x - mLastX), (int)(mSelectedItem->y() + y - mLastY) );
|
||||
} else {
|
||||
mSelectedItem->setX( mSelectedItem->x() + x - mLastX );
|
||||
mSelectedItem->setY( mSelectedItem->y() + y - mLastY );
|
||||
}
|
||||
|
||||
QgsComposerItem *ci = dynamic_cast <QgsComposerItem *> (mSelectedItem);
|
||||
ci->writeSettings();
|
||||
@ -361,6 +386,12 @@ void QgsComposition::contentsMouseMoveEvent(QMouseEvent* e)
|
||||
mNewCanvasItem->setY( p.y() );
|
||||
mCanvas->update();
|
||||
break;
|
||||
|
||||
case AddScalebar:
|
||||
QgsComposerScalebar *sb = dynamic_cast<QgsComposerScalebar *> (mNewCanvasItem);
|
||||
sb->move ( p.x(), p.y() );
|
||||
mCanvas->update();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -583,6 +614,16 @@ void QgsComposition::setTool ( Tool tool )
|
||||
mNewCanvasItem = dynamic_cast <QCanvasItem *> (lab);
|
||||
mComposer->showItemOptions ( lab->options() );
|
||||
|
||||
mView->viewport()->setMouseTracking ( true ); // to recieve mouse move
|
||||
} else if ( tool == AddScalebar ) {
|
||||
if ( mNewCanvasItem ) delete mNewCanvasItem;
|
||||
|
||||
// Create new object outside the visible area
|
||||
QgsComposerScalebar *sb = new QgsComposerScalebar ( this, mNextItemId++,
|
||||
(-1000)*mScale, (-1000)*mScale );
|
||||
mNewCanvasItem = dynamic_cast <QCanvasItem *> (sb);
|
||||
mComposer->showItemOptions ( sb->options() );
|
||||
|
||||
mView->viewport()->setMouseTracking ( true ); // to recieve mouse move
|
||||
}
|
||||
|
||||
@ -682,6 +723,7 @@ bool QgsComposition::readSettings ( void )
|
||||
path.sprintf("/composition_%d", mId );
|
||||
QStringList el = QgsProject::instance()->subkeyList ( "Compositions", path );
|
||||
|
||||
// First maps because they can be used by other objects
|
||||
for ( QStringList::iterator it = el.begin(); it != el.end(); ++it ) {
|
||||
std::cout << "key: " << (*it).ascii() << std::endl;
|
||||
|
||||
@ -694,12 +736,30 @@ bool QgsComposition::readSettings ( void )
|
||||
if ( name.compare("map") == 0 ) {
|
||||
QgsComposerMap *map = new QgsComposerMap ( this, id );
|
||||
mItems.push_back(map);
|
||||
} else if ( name.compare("vectorlegend") == 0 ) {
|
||||
}
|
||||
|
||||
if ( id >= mNextItemId ) mNextItemId = id + 1;
|
||||
}
|
||||
}
|
||||
|
||||
for ( QStringList::iterator it = el.begin(); it != el.end(); ++it ) {
|
||||
std::cout << "key: " << (*it).ascii() << std::endl;
|
||||
|
||||
QStringList l = QStringList::split( '_', (*it) );
|
||||
if ( l.size() == 2 ) {
|
||||
QString name = l.first();
|
||||
QString ids = l.last();
|
||||
int id = ids.toInt();
|
||||
|
||||
if ( name.compare("vectorlegend") == 0 ) {
|
||||
QgsComposerVectorLegend *vl = new QgsComposerVectorLegend ( this, id );
|
||||
mItems.push_back(vl);
|
||||
} else if ( name.compare("label") == 0 ) {
|
||||
QgsComposerLabel *lab = new QgsComposerLabel ( this, id );
|
||||
mItems.push_back(lab);
|
||||
} else if ( name.compare("scalebar") == 0 ) {
|
||||
QgsComposerScalebar *sb = new QgsComposerScalebar ( this, id );
|
||||
mItems.push_back(sb);
|
||||
}
|
||||
|
||||
if ( id >= mNextItemId ) mNextItemId = id + 1;
|
||||
|
||||
@ -79,7 +79,8 @@ public:
|
||||
Select = 0, // Select/Move item
|
||||
AddMap, // add new map
|
||||
AddVectorLegend, // add vector legend
|
||||
AddLabel // add label
|
||||
AddLabel, // add label
|
||||
AddScalebar // add scalebar
|
||||
};
|
||||
|
||||
/** \brief Scaling mode, defines which parameters are fixed and which are changing */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user