Merging from the BR_V5_DEV branch.

diff --git a/src/Plot2d/resources/plot2d_legend.png b/src/Plot2d/resources/plot2d_legend.png
index 81c06277b4f1d65c661c16b6209c9cbd2c700de4..0e367cee9bf1917f23aad0692270538b6f78ef80 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_legend.png and b/src/Plot2d/resources/plot2d_legend.png differ

diff --git a/src/Plot2d/resources/plot2d_linear.png b/src/Plot2d/resources/plot2d_linear.png
index 0140fcc9874aa12603941a4600f0555929d097d6..d4aa312d40238013ee910b4d6d30cfc958e76e24 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_linear.png and b/src/Plot2d/resources/plot2d_linear.png differ

diff --git a/src/Plot2d/resources/plot2d_linear_y.png b/src/Plot2d/resources/plot2d_linear_y.png
index 7acc8fe79ed852c978baf3e7af4c62501c3e269c..e783449c4c539843e09d98327ec16df9d601b1fb 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_linear_y.png and b/src/Plot2d/resources/plot2d_linear_y.png differ

diff --git a/src/Plot2d/resources/plot2d_lines.png b/src/Plot2d/resources/plot2d_lines.png
index 9789452845376333452f55f398bcc3f9e4124bc4..667189e22d7dfe0a7926c544e2129750a5468a55 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_lines.png and b/src/Plot2d/resources/plot2d_lines.png differ

diff --git a/src/Plot2d/resources/plot2d_log.png b/src/Plot2d/resources/plot2d_log.png
index fb62cd77242c43e92c8dd638560f0ce535fae6fb..1a6d7113c9b98294165a9b77b8df4598cfb6392c 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_log.png and b/src/Plot2d/resources/plot2d_log.png differ

diff --git a/src/Plot2d/resources/plot2d_log_y.png b/src/Plot2d/resources/plot2d_log_y.png
index 825d59edbabe2880137e8a8f6537a7124335edef..6958828c63b97191eee9b28d11d90c70673484e5 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_log_y.png and b/src/Plot2d/resources/plot2d_log_y.png differ

diff --git a/src/Plot2d/resources/plot2d_points.png b/src/Plot2d/resources/plot2d_points.png
index 3cdea33dde6e749d0c718bc4f2c640d5fccad1c1..15d914afa9d3fdcd992085ddbfc6413ed6ace64c 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_points.png and b/src/Plot2d/resources/plot2d_points.png differ

diff --git a/src/Plot2d/resources/plot2d_settings.png b/src/Plot2d/resources/plot2d_settings.png
index 64df2460b754730b6147340d542bd8906eeb292b..b6137462cbf4845760b2cdea96f425c5f7f6a120 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_settings.png and b/src/Plot2d/resources/plot2d_settings.png differ

diff --git a/src/Plot2d/resources/plot2d_splines.png b/src/Plot2d/resources/plot2d_splines.png
index 06a95572db8bb67fe21ae249da802c8da1091026..71f37f943db548c0c43f026c0d16797c96b2a066 100755 (executable)
Binary files a/src/Plot2d/resources/plot2d_splines.png and b/src/Plot2d/resources/plot2d_splines.png differ

diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index 74d64ae9fcb0fe285b465de70c0180413b109b2f..03c9e9d310b1f801d845376f13575a20ce3038ca 100755 (executable)
--- 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 1f853454c0458ff10b460c0c6842b6247c206aba..60ee0c434b1a41e69765e86d2ad37e5d8b28654f 100755 (executable)
--- 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;