From a0c6093cdd51a5fac022dd839a881b51d6a8c0c6 Mon Sep 17 00:00:00 2001 From: nds Date: Mon, 6 Oct 2008 10:36:41 +0000 Subject: [PATCH] Merging from the BR_V5_DEV branch. --- src/Plot2d/resources/plot2d_legend.png | Bin 790 -> 789 bytes src/Plot2d/resources/plot2d_linear.png | Bin 789 -> 788 bytes src/Plot2d/resources/plot2d_linear_y.png | Bin 778 -> 777 bytes src/Plot2d/resources/plot2d_lines.png | Bin 408 -> 407 bytes src/Plot2d/resources/plot2d_log.png | Bin 721 -> 720 bytes src/Plot2d/resources/plot2d_log_y.png | Bin 744 -> 743 bytes src/Plot2d/resources/plot2d_points.png | Bin 343 -> 342 bytes src/Plot2d/resources/plot2d_settings.png | Bin 764 -> 763 bytes src/Plot2d/resources/plot2d_splines.png | Bin 432 -> 431 bytes src/SUIT/SUIT_ViewWindow.cxx | 8 ++++++++ src/SUIT/SUIT_ViewWindow.h | 2 ++ 11 files changed, 10 insertions(+) diff --git a/src/Plot2d/resources/plot2d_legend.png b/src/Plot2d/resources/plot2d_legend.png index 81c06277b4f1d65c661c16b6209c9cbd2c700de4..0e367cee9bf1917f23aad0692270538b6f78ef80 100755 GIT binary patch delta 13 UcmbQnHkFN~Gr-S%BdZ`Y02^TgbN~PV delta 14 VcmbQrHjRz7Gr-TCcO#1+GXNe@1Azbl diff --git a/src/Plot2d/resources/plot2d_linear.png b/src/Plot2d/resources/plot2d_linear.png index 0140fcc9874aa12603941a4600f0555929d097d6..d4aa312d40238013ee910b4d6d30cfc958e76e24 100755 GIT binary patch delta 13 UcmbQrHieC)Gr-S%BdY*202@aGaR2}S delta 14 VcmbQjHkFOFGr-TCcO#1cGXNen1AYJi diff --git a/src/Plot2d/resources/plot2d_linear_y.png b/src/Plot2d/resources/plot2d_linear_y.png index 7acc8fe79ed852c978baf3e7af4c62501c3e269c..e783449c4c539843e09d98327ec16df9d601b1fb 100755 GIT binary patch delta 13 UcmeBT>tti;4DfT`$jZtL02(O+Pyhe` delta 14 VcmeBV>tbW=4DfU3-N?eq3;-Pg16=?B diff --git a/src/Plot2d/resources/plot2d_lines.png b/src/Plot2d/resources/plot2d_lines.png index 9789452845376333452f55f398bcc3f9e4124bc4..667189e22d7dfe0a7926c544e2129750a5468a55 100755 GIT binary patch delta 13 UcmbQiJe`@PGr-S%BkN>F031;R@&Et; delta 14 VcmbQvJcF6FGr-TCcO%PWMgSi_1OEU3 diff --git a/src/Plot2d/resources/plot2d_log.png b/src/Plot2d/resources/plot2d_log.png index fb62cd77242c43e92c8dd638560f0ce535fae6fb..1a6d7113c9b98294165a9b77b8df4598cfb6392c 100755 GIT binary patch delta 13 Ucmcb}dV!UtGr-S%BkLI^03t{Pq5uE@ delta 14 Vcmcb>dXbg2Gr-TCcO%OgCIBU@1g`)9 diff --git a/src/Plot2d/resources/plot2d_log_y.png b/src/Plot2d/resources/plot2d_log_y.png index 825d59edbabe2880137e8a8f6537a7124335edef..6958828c63b97191eee9b28d11d90c70673484e5 100755 GIT binary patch delta 13 UcmaFC`ka-eGr-S%BkN-(03@CS=Kufz delta 14 VcmaFP`hu0UGr-TCcO%PVCIBcf1oQv^ diff --git a/src/Plot2d/resources/plot2d_points.png b/src/Plot2d/resources/plot2d_points.png index 3cdea33dde6e749d0c718bc4f2c640d5fccad1c1..15d914afa9d3fdcd992085ddbfc6413ed6ace64c 100755 GIT binary patch delta 13 Ucmcc4bd8CnGr-S%BWn;N03o3SEdT%j delta 14 Vcmcb{be)N{Gr-TCcOy#>BLF1}1Udi! diff --git a/src/Plot2d/resources/plot2d_settings.png b/src/Plot2d/resources/plot2d_settings.png index 64df2460b754730b6147340d542bd8906eeb292b..b6137462cbf4845760b2cdea96f425c5f7f6a120 100755 GIT binary patch delta 13 Ucmeyv`kR%dGr-S%BkOl204AmdBLDyZ delta 14 Vcmey(`iGUZGr-TCcO%PpCIBj61uy^r diff --git a/src/Plot2d/resources/plot2d_splines.png b/src/Plot2d/resources/plot2d_splines.png index 06a95572db8bb67fe21ae249da802c8da1091026..71f37f943db548c0c43f026c0d16797c96b2a066 100755 GIT binary patch delta 13 UcmdnMyq=k*Gr-S%BkO8L03N{vIsgCw delta 14 VcmZ3_yn&guGr-TCcO%PcMgSq-1V;b> diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx index 74d64ae9f..03c9e9d31 100755 --- a/src/SUIT/SUIT_ViewWindow.cxx +++ b/src/SUIT/SUIT_ViewWindow.cxx @@ -326,3 +326,11 @@ QtxActionToolMgr* SUIT_ViewWindow::toolMgr() const { return myToolMgr; } + +/*! + \return window unique identifier +*/ +int SUIT_ViewWindow::getId() const +{ + return int(long(this)); +} diff --git a/src/SUIT/SUIT_ViewWindow.h b/src/SUIT/SUIT_ViewWindow.h index 1f853454c..60ee0c434 100755 --- a/src/SUIT/SUIT_ViewWindow.h +++ b/src/SUIT/SUIT_ViewWindow.h @@ -53,6 +53,8 @@ public: virtual void setVisualParameters( const QString& parameters ); void setDestructiveClose( const bool ); + + int getId() const; QtxActionToolMgr* toolMgr() const; -- 2.39.2