From: ouv Date: Thu, 20 Mar 2014 07:44:45 +0000 (+0400) Subject: GUITHARE external issue 0020696: 2D 3D surfaces. X-Git-Tag: CTH_1_10_a~16 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8ea74b6e0f752153412a6678577edfb581e0f397;p=modules%2Fgui.git GUITHARE external issue 0020696: 2D 3D surfaces. Point 2. Remove curves. --- diff --git a/adm_local/win32/All.vcproj b/adm_local/win32/All.vcproj index e706dddcd..e9e2f8f08 100644 --- a/adm_local/win32/All.vcproj +++ b/adm_local/win32/All.vcproj @@ -1,89 +1,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/CAF.vcproj b/adm_local/win32/CAF.vcproj index 01513d66a..a3406e84f 100644 --- a/adm_local/win32/CAF.vcproj +++ b/adm_local/win32/CAF.vcproj @@ -1,574 +1,574 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/CAM.vcproj b/adm_local/win32/CAM.vcproj index de4f210c2..15d405d8e 100644 --- a/adm_local/win32/CAM.vcproj +++ b/adm_local/win32/CAM.vcproj @@ -1,648 +1,648 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/Event.vcproj b/adm_local/win32/Event.vcproj index 0e0d5e4db..1fd610ec5 100644 --- a/adm_local/win32/Event.vcproj +++ b/adm_local/win32/Event.vcproj @@ -1,273 +1,273 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/GLViewer.vcproj b/adm_local/win32/GLViewer.vcproj index 279ed77de..8a0fa16bd 100644 --- a/adm_local/win32/GLViewer.vcproj +++ b/adm_local/win32/GLViewer.vcproj @@ -1,2022 +1,2022 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/GraphicsView.vcproj b/adm_local/win32/GraphicsView.vcproj index c9b5c0741..c418f1db9 100644 --- a/adm_local/win32/GraphicsView.vcproj +++ b/adm_local/win32/GraphicsView.vcproj @@ -1,802 +1,802 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/LogWindow.vcproj b/adm_local/win32/LogWindow.vcproj index cbf00690d..abcdab8ff 100644 --- a/adm_local/win32/LogWindow.vcproj +++ b/adm_local/win32/LogWindow.vcproj @@ -1,277 +1,277 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/OBJECT.vcproj b/adm_local/win32/OBJECT.vcproj index 5181acc05..2a5cb637f 100644 --- a/adm_local/win32/OBJECT.vcproj +++ b/adm_local/win32/OBJECT.vcproj @@ -1,697 +1,697 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/ObjBrowser.vcproj b/adm_local/win32/ObjBrowser.vcproj index b45aa4283..7653fb07f 100644 --- a/adm_local/win32/ObjBrowser.vcproj +++ b/adm_local/win32/ObjBrowser.vcproj @@ -1,354 +1,354 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/Plot2d.vcproj b/adm_local/win32/Plot2d.vcproj index 19fb5f7a1..a577c44dd 100644 --- a/adm_local/win32/Plot2d.vcproj +++ b/adm_local/win32/Plot2d.vcproj @@ -1,1246 +1,1270 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/Prs.vcproj b/adm_local/win32/Prs.vcproj index 96e02a546..599384771 100644 --- a/adm_local/win32/Prs.vcproj +++ b/adm_local/win32/Prs.vcproj @@ -1,244 +1,244 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/Qtx.vcproj b/adm_local/win32/Qtx.vcproj index cd67a394e..4168ae50b 100644 --- a/adm_local/win32/Qtx.vcproj +++ b/adm_local/win32/Qtx.vcproj @@ -1,1669 +1,1669 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/SPlot2d.vcproj b/adm_local/win32/SPlot2d.vcproj index b57a29e31..795daa610 100644 --- a/adm_local/win32/SPlot2d.vcproj +++ b/adm_local/win32/SPlot2d.vcproj @@ -1,370 +1,370 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/STD.vcproj b/adm_local/win32/STD.vcproj index bb66f6926..ed96638e9 100644 --- a/adm_local/win32/STD.vcproj +++ b/adm_local/win32/STD.vcproj @@ -1,922 +1,922 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/SUIT.vcproj b/adm_local/win32/SUIT.vcproj index ad36284b4..ba4276037 100644 --- a/adm_local/win32/SUIT.vcproj +++ b/adm_local/win32/SUIT.vcproj @@ -1,1970 +1,1970 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/SUITApp.vcproj b/adm_local/win32/SUITApp.vcproj index 4cdf0dc87..a28daec57 100644 --- a/adm_local/win32/SUITApp.vcproj +++ b/adm_local/win32/SUITApp.vcproj @@ -1,335 +1,335 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adm_local/win32/SVTK.vcproj b/adm_local/win32/SVTK.vcproj index 9a9fe135e..2591e62a2 100644 --- a/adm_local/win32/SVTK.vcproj +++ b/adm_local/win32/SVTK.vcproj @@ -281,6 +281,30 @@ /> + + + + + + + + @@ -545,6 +569,30 @@ /> + + + + + + + + @@ -583,7 +631,7 @@ @@ -593,11 +641,35 @@ + + + + + + + + @@ -1535,6 +1607,10 @@ RelativePath="..\..\src\SVTK\Plot3d_Actor.cxx" > + + @@ -1684,6 +1760,10 @@ Name="Meta Object Files" Filter="moc_*.cxx" > + + diff --git a/adm_local/win32/Style.vcproj b/adm_local/win32/Style.vcproj index 98e338ff2..b19b0f6d6 100644 --- a/adm_local/win32/Style.vcproj +++ b/adm_local/win32/Style.vcproj @@ -1,373 +1,373 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SVTK/Plot3d_Actor.h b/src/SVTK/Plot3d_Actor.h index dfc98ea8a..d53d29284 100644 --- a/src/SVTK/Plot3d_Actor.h +++ b/src/SVTK/Plot3d_Actor.h @@ -16,8 +16,8 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#ifndef PLOT3D_VIEWMODEL_H -#define PLOT3D_VIEWMODEL_H +#ifndef PLOT3D_ACTOR_H +#define PLOT3D_ACTOR_H #include "SVTK.h" diff --git a/src/SVTK/Plot3d_SetupSurfacesDlg.cxx b/src/SVTK/Plot3d_SetupSurfacesDlg.cxx new file mode 100644 index 000000000..a1c1e49af --- /dev/null +++ b/src/SVTK/Plot3d_SetupSurfacesDlg.cxx @@ -0,0 +1,223 @@ +// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SALOME Plot3d : implementation of desktop and GUI kernel +// +// File : Plot3d_SetupSurfacesDlg.cxx +// Author : Sergey LITONIN + +#include "Plot3d_SetupSurfacesDlg.h" + +#include + +#include +#include + +#include +#include +#include +#include +#include + +#define TEXT_COL 0 + +/*! + \brief Constructor + \param theParent parent widget +*/ +Plot3d_SetupSurfacesDlg::Plot3d_SetupSurfacesDlg( QWidget* theParent ) +: QtxDialog( theParent, true, false, QtxDialog::OKCancel ) +{ + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + setWindowTitle( tr( "SETUP_SURFACES" ) ); + + QFrame* aMainFrame = mainFrame(); + + QVBoxLayout* aMainLay = new QVBoxLayout( aMainFrame ); + aMainLay->setMargin( 5 ); + + myGrp = new QtxGroupBox( aMainFrame ); + myGrp->setTitle( tr( "PARAMETERS" ) ); + aMainLay->addWidget( myGrp ); + + QVBoxLayout* aLay = new QVBoxLayout( myGrp ); + aLay->setMargin( 0 ); + + // Create table + myTable = new QTableWidget( myGrp ); + myTable->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); + + aLay->addWidget( myTable ); + + myTable->setRowCount( 0 ); + myTable->setColumnCount( 1 ); + + QStringList aLabels; + aLabels.append( tr( "TEXT" ) ); + myTable->setHorizontalHeaderLabels( aLabels ); + myTable->verticalHeader()->hide(); + myTable->setSelectionMode( QTableWidget::NoSelection ); + + QComboBox* aCombo = new QComboBox( 0 ); + myTable->verticalHeader()->setDefaultSectionSize( aCombo->sizeHint().height() ); + delete aCombo; + + int l, t, r, b; + myTable->getContentsMargins( &l, &t, &r, &b ); + myTable->setContentsMargins( 0, t, r, b ); + + myTable->horizontalHeader()->setResizeMode( TEXT_COL, QHeaderView::Stretch ); + myTable->horizontalHeader()->setHighlightSections( false ); + + // Minus button + QPixmap minusPix = aResMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_MINUS" ) ); + myRemoveBtn = new QToolButton( 0 ); + myRemoveBtn->setIcon( minusPix ); + myRemoveBtn->setFixedSize( minusPix.size() ); + myGrp->insertTitleWidget( myRemoveBtn ); + + connect( myRemoveBtn, SIGNAL( clicked() ), SLOT( onRemove() ) ); + connect( myTable, SIGNAL( valueChanged( int, int ) ), SLOT( onValueChanged( int, int ) ) ); + + setButtonPosition( Right, Cancel ); + setMinimumWidth( 500 ); + setMinimumHeight( 250 ); +} + +/*! + \brief Destructor +*/ +Plot3d_SetupSurfacesDlg::~Plot3d_SetupSurfacesDlg() +{ +} + +/*! + \brief Sets text in specified cell + \param theRow row + \param theCol column + \param theText text +*/ +void Plot3d_SetupSurfacesDlg::setText( const int theRow, + const int theCol, + const QString& theText ) +{ + QTableWidgetItem* anItem = myTable->item( theRow, theCol ); + if ( !anItem ) + { + anItem = new QTableWidgetItem( theText ); + myTable->setItem( theRow, theCol, anItem ); + } + else + anItem->setText( theText ); +} + +//============================================================================= +// Function : SetParameters +// Purpose : +//============================================================================= +void Plot3d_SetupSurfacesDlg::SetParameters( const QVector< QString >& theTexts ) +{ + int nbRows = theTexts.size(); + + myTable->setRowCount( nbRows ); + + for ( int i = 0; i < nbRows; i++ ) + { + QString aText = theTexts[ i ]; + aText.replace( QChar('\n'), QChar( ' ' ) ); + setText( i, TEXT_COL, aText ); + } + + myRemovedIndexes.clear(); +} + +//============================================================================= +// Function : GetParameters +// Purpose : +//============================================================================= +void Plot3d_SetupSurfacesDlg::GetParameters( QVector< QString >& theTexts ) const +{ + int nbRows = myTable->rowCount(); + + theTexts.resize( nbRows ); + + for ( int i = 0; i < nbRows; i++ ) + { + QTableWidgetItem* it = myTable->item( i, TEXT_COL ); + theTexts[ i ] = it ? it->text() : ""; + theTexts[ i ].replace( ' ', '\n' ); + } +} + +//============================================================================= +// Function : GetRemovedIndexes +// Purpose : +//============================================================================= +const QList< int >& Plot3d_SetupSurfacesDlg::GetRemovedIndexes() const +{ + return myRemovedIndexes; +} + +//============================================================================= +// Function : onRemove +// Purpose : +//============================================================================= +void Plot3d_SetupSurfacesDlg::onRemove() +{ + QList< int > toRemove; + + int aCurrRow = myTable->currentRow(); + int aCurrCol = myTable->currentColumn(); + + // get selected rows + QSet< int > aSelRows; + QList aRegs = myTable->selectedRanges(); + QList::iterator selIter; + for ( selIter = aRegs.begin(); selIter != aRegs.end(); ++selIter ) + { + const QTableWidgetSelectionRange& aReg = *selIter; + for ( int i = aReg.topRow(), n = aReg.bottomRow(); i < n; i++ ) + aSelRows.insert( i ); + } + + int i, n; + for ( i = 0, n = myTable->rowCount(); i < n; i++ ) + { + if ( aSelRows.contains( i ) || aCurrRow == i ) + toRemove.append( i ); + } + + if ( !toRemove.count() ) + return; + + int nbRemoved = 0; + QList< int >::iterator anIter; + for ( anIter = toRemove.begin(); anIter != toRemove.end(); ++anIter ) + { + int aRow = *anIter - nbRemoved; + myTable->removeRow( aRow ); + myRemovedIndexes.append( aRow ); + nbRemoved++; + } + + int nbRows = myTable->rowCount(); + if ( aCurrRow < nbRows && aCurrRow >= 0 && aCurrCol >= 0 ) + myTable->setCurrentCell( aCurrRow, aCurrCol ); + else if ( nbRows > 0 && aCurrCol >= 0 ) + myTable->setCurrentCell( nbRows - 1, aCurrCol ); +} diff --git a/src/SVTK/Plot3d_SetupSurfacesDlg.h b/src/SVTK/Plot3d_SetupSurfacesDlg.h new file mode 100644 index 000000000..20176a05c --- /dev/null +++ b/src/SVTK/Plot3d_SetupSurfacesDlg.h @@ -0,0 +1,77 @@ +// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SALOME Plot3d : implementation of desktop and GUI kernel +// +// File : Plot3d_SetupSurfacesDlg.h +// Author : Sergey LITONIN + +#ifndef PLOT3D_SETUPSURFACESDLG_H +#define PLOT3D_SETUPSURFACESDLG_H + +#include "SVTK.h" + +#include +#include +#include + +class QtxGroupBox; +class QTableWidget; +class QwtLegend; +class QToolButton; + +#if defined WIN32 +#pragma warning( disable: 4251 ) +#endif + +/*! + \class Plot3d_SetupSurfacesDlg + Dialog box for setup Plot3d surfaces parameters +*/ + +class SVTK_EXPORT Plot3d_SetupSurfacesDlg : public QtxDialog +{ + Q_OBJECT + +public: + Plot3d_SetupSurfacesDlg( QWidget* theParent = 0 ); + virtual ~Plot3d_SetupSurfacesDlg(); + + void SetParameters( const QVector< QString >& theTexts ); + void GetParameters( QVector< QString >& theText ) const; + + const QList< int >& GetRemovedIndexes() const; + +private slots: + + void onRemove(); + +private: + + void setText( const int theRow, + const int theCol, + const QString& theText ); +private: + + QtxGroupBox* myGrp; + QTableWidget* myTable; + QToolButton* myRemoveBtn; + QList< int > myRemovedIndexes; +}; + +#endif diff --git a/src/SVTK/Plot3d_ViewModel.cxx b/src/SVTK/Plot3d_ViewModel.cxx index 5037c5ca1..27e1cbef0 100644 --- a/src/SVTK/Plot3d_ViewModel.cxx +++ b/src/SVTK/Plot3d_ViewModel.cxx @@ -41,6 +41,9 @@ SUIT_ViewWindow* Plot3d_Viewer::createView( SUIT_Desktop* theDesktop ) { SUIT_ViewWindow* aViewWindow = SVTK_Viewer::createView( theDesktop ); if( SVTK_ViewWindow* aSVTKViewWindow = dynamic_cast( aViewWindow ) ) - aSVTKViewWindow->SetMode2DEnabled( true ); + { + aSVTKViewWindow->SetActionVisible( SVTK_ViewWindow::Mode2DId, true ); + aSVTKViewWindow->SetActionVisible( SVTK_ViewWindow::SurfacesSettingsId, true ); + } return aViewWindow; } diff --git a/src/SVTK/SVTK_ViewWindow.cxx b/src/SVTK/SVTK_ViewWindow.cxx index 7cc026065..ad94c7c18 100755 --- a/src/SVTK/SVTK_ViewWindow.cxx +++ b/src/SVTK/SVTK_ViewWindow.cxx @@ -23,6 +23,9 @@ #include "SVTK_SetRotationPointDlg.h" #include "SVTK_ViewParameterDlg.h" +#include "Plot3d_Actor.h" +#include "Plot3d_SetupSurfacesDlg.h" + #include "SALOME_Actor.h" #include @@ -1936,6 +1939,15 @@ void SVTK_ViewWindow::createActions(SUIT_ResourceMgr* theResourceMgr) connect(anAction, SIGNAL(toggled(bool)), this, SLOT(onViewParameters(bool))); mgr->registerAction( anAction, ViewParametersId ); + // Switch between 3D (default) and 2D modes + anAction = new QtxAction(tr("MNU_SVTK_MODE_2D"), + theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_MODE_2D" ) ), + tr( "MNU_SVTK_MODE_2D" ), 0, this); + anAction->setStatusTip(tr("DSC_SVTK_MODE_2D")); + anAction->setCheckable(true); + connect(anAction, SIGNAL(toggled(bool)), this, SLOT(onMode2D(bool))); + mgr->registerAction( anAction, Mode2DId ); + // Switch between interaction styles anAction = new QtxAction(tr("MNU_SVTK_STYLE_SWITCH"), theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_STYLE_SWITCH" ) ), @@ -1945,14 +1957,13 @@ void SVTK_ViewWindow::createActions(SUIT_ResourceMgr* theResourceMgr) connect(anAction, SIGNAL(toggled(bool)), this, SLOT(onSwitchInteractionStyle(bool))); mgr->registerAction( anAction, SwitchInteractionStyleId ); - // Switch between 3D (default) and 2D modes - anAction = new QtxAction(tr("MNU_SVTK_MODE_2D"), - theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_MODE_2D" ) ), - tr( "MNU_SVTK_MODE_2D" ), 0, this); - anAction->setStatusTip(tr("DSC_SVTK_MODE_2D")); - anAction->setCheckable(true); - connect(anAction, SIGNAL(toggled(bool)), this, SLOT(onMode2D(bool))); - mgr->registerAction( anAction, Mode2DId ); + // Surfaces settings + anAction = new QtxAction(tr("MNU_SVTK_SURFACES_SETTINGS"), + theResourceMgr->loadPixmap( "VTKViewer", tr( "ICON_SVTK_SURFACES_SETTINGS" ) ), + tr( "MNU_SVTK_SURFACES_SETTINGS" ), 0, this); + anAction->setStatusTip(tr("DSC_SVTK_SURFACES_SETTINGS")); + connect(anAction, SIGNAL(activated()), this, SLOT(onSurfacesSettings())); + mgr->registerAction( anAction, SurfacesSettingsId ); // Start recording myStartAction = new QtxAction(tr("MNU_SVTK_RECORDING_START"), @@ -2033,6 +2044,7 @@ void SVTK_ViewWindow::createToolBar() mgr->append( GraduatedAxes, myToolBar ); mgr->append( ViewParametersId, myToolBar ); + mgr->append( SurfacesSettingsId, myToolBar ); mgr->append( ProjectionModeId, myToolBar ); mgr->append( StartRecordingId, myRecordingToolBar ); @@ -2040,8 +2052,9 @@ void SVTK_ViewWindow::createToolBar() mgr->append( PauseRecordingId, myRecordingToolBar ); mgr->append( StopRecordingId, myRecordingToolBar ); - // the Mode2D action is enabled on demand + // the following actions are enabled on demand getAction( Mode2DId )->setVisible( false ); + getAction( SurfacesSettingsId )->setVisible( false ); } void SVTK_ViewWindow::onUpdateRate(bool theIsActivate) @@ -2208,11 +2221,13 @@ void SVTK_ViewWindow::hideEvent( QHideEvent * theEvent ) } /*! - Show/hide the Mode2D action + Show/hide the specified action */ -void SVTK_ViewWindow::SetMode2DEnabled( const bool theIsEnabled ) +void SVTK_ViewWindow::SetActionVisible( const int theActionId, + const bool theIsVisible ) { - getAction( Mode2DId )->setVisible( theIsEnabled ); + if( QtxAction* anAction = getAction( theActionId ) ) + anAction->setVisible( theIsVisible ); } /*! @@ -2222,3 +2237,105 @@ void SVTK_ViewWindow::SetMode2DNormalAxis( const int theAxis ) { myMode2DNormalAxis = theAxis; } + +/*! + Change the surfaces settings +*/ +void SVTK_ViewWindow::onSurfacesSettings() +{ + vtkRenderer* aRenderer = getRenderer(); + if( !aRenderer ) + return; + + QList< Plot3d_Actor* > aSurfaces; + QStringList aNameList; + vtkActor* anActor = 0; + + VTK::ActorCollectionCopy aCopy( aRenderer->GetActors() ); + vtkActorCollection* aCollection = aCopy.GetActors(); + aCollection->InitTraversal(); + while( anActor = aCollection->GetNextActor() ) + { + if( Plot3d_Actor* aSurface = dynamic_cast( anActor ) ) + { + aSurfaces << aSurface; + aNameList << aSurface->getName(); + } + } + + QVector< QString > aTexts = aNameList.toVector(); + + Plot3d_SetupSurfacesDlg aDlg; + aDlg.SetParameters( aTexts ); + + if ( aDlg.exec() != QDialog::Accepted ) + return; + + // Note: Indexes retrieved from dialog do not correspond to the real indexes of + // plot 3d surfaces. They correspond to the user actions. For example, if user removes + // first surface in dialog's table two times. Then contents of list of indexes is + // equal (1, 1) although first and surfaces curves must be removed. + const QList< int >& toRemove = aDlg.GetRemovedIndexes(); + QList< int >::const_iterator aRemIter; + for ( aRemIter = toRemove.begin(); aRemIter != toRemove.end(); ++aRemIter ) + { + int anIndex = *aRemIter; + if ( anIndex >= 0 && anIndex < (int)aSurfaces.count() ) + { + Plot3d_Actor* aSurface = aSurfaces[ anIndex ]; + aSurfaces.removeAt( anIndex ); + aSurface->RemoveFromRender( aRenderer ); + } + } + + QMap< int, Plot3d_Actor* > anIndexToSurface; + QList< Plot3d_Actor* >::iterator aSurfIter; + int i; + for ( i = 0, aSurfIter = aSurfaces.begin(); aSurfIter != aSurfaces.end(); ++aSurfIter, ++i ) + anIndexToSurface[ i ] = *aSurfIter; + + aDlg.GetParameters( aTexts ); + + int n; + for ( i = 0, n = aTexts.size(); i < n; i++ ) + { + Plot3d_Actor* aSurface = anIndexToSurface[ i ]; + QString aText = aTexts[ i ]; + aSurface->setName( aText.toLatin1().constData() ); + } + + vtkFloatingPointType aGlobalBounds[6] = { VTK_DOUBLE_MAX, VTK_DOUBLE_MIN, + VTK_DOUBLE_MAX, VTK_DOUBLE_MIN, + VTK_DOUBLE_MAX, VTK_DOUBLE_MIN }; + + for ( i = 0, aSurfIter = aSurfaces.begin(); aSurfIter != aSurfaces.end(); ++aSurfIter, ++i ) + { + if( Plot3d_Actor* aSurface = *aSurfIter ) + { + vtkFloatingPointType aBounds[6]; + aSurface->GetBounds( aBounds ); + aGlobalBounds[0] = qMin( aGlobalBounds[0], aBounds[0] ); + aGlobalBounds[1] = qMax( aGlobalBounds[1], aBounds[1] ); + aGlobalBounds[2] = qMin( aGlobalBounds[2], aBounds[2] ); + aGlobalBounds[3] = qMax( aGlobalBounds[3], aBounds[3] ); + aGlobalBounds[4] = qMin( aGlobalBounds[4], aBounds[4] ); + aGlobalBounds[5] = qMax( aGlobalBounds[5], aBounds[5] ); + } + } + + double aDX = aGlobalBounds[1] - aGlobalBounds[0]; + double aDY = aGlobalBounds[3] - aGlobalBounds[2]; + double aDZ = aGlobalBounds[5] - aGlobalBounds[4]; + + double aScale[3]; + GetScale( aScale ); // take into account the current scale + aDX = fabs( aScale[0] ) > DBL_EPSILON ? aDX / aScale[0] : aDX; + aDY = fabs( aScale[1] ) > DBL_EPSILON ? aDY / aScale[1] : aDY; + aDZ = fabs( aScale[2] ) > DBL_EPSILON ? aDZ / aScale[2] : aDZ; + + aScale[0] = fabs( aDX ) > DBL_EPSILON ? 1.0 / aDX : 1.0; + aScale[1] = fabs( aDY ) > DBL_EPSILON ? 1.0 / aDY : 1.0; + aScale[2] = fabs( aDZ ) > DBL_EPSILON ? 1.0 / aDZ : 1.0; + SetScale( aScale ); + onFitAll(); +} diff --git a/src/SVTK/SVTK_ViewWindow.h b/src/SVTK/SVTK_ViewWindow.h index 83553fdde..3df84190c 100755 --- a/src/SVTK/SVTK_ViewWindow.h +++ b/src/SVTK/SVTK_ViewWindow.h @@ -76,6 +76,14 @@ class SVTK_EXPORT SVTK_ViewWindow : public SUIT_ViewWindow Q_OBJECT; public: + enum { DumpId, FitAllId, FitRectId, ZoomId, PanId, GlobalPanId, + ChangeRotationPointId, RotationId, + FrontId, BackId, TopId, BottomId, LeftId, RightId, ResetId, + ViewTrihedronId, NonIsometric, GraduatedAxes, UpdateRate, + ProjectionModeId, ViewParametersId, SwitchInteractionStyleId, + Mode2DId, SurfacesSettingsId, + StartRecordingId, PlayRecordingId, PauseRecordingId, StopRecordingId }; + enum Axis { AxisX = 0, AxisY, AxisZ }; public: @@ -251,8 +259,9 @@ class SVTK_EXPORT SVTK_ViewWindow : public SUIT_ViewWindow //! To invoke a VTK event on #SVTK_RenderWindowInteractor instance void InvokeEvent(unsigned long theEvent, void* theCallData); - //! Show/hide the Mode2D action - void SetMode2DEnabled( const bool theIsEnabled ); + //! Show/hide the specified action + void SetActionVisible( const int theActionId, + const bool theIsVisible ); //! Set the normal axis for the 2D mode void SetMode2DNormalAxis( const int theAxis ); @@ -301,6 +310,8 @@ public slots: void onSwitchInteractionStyle(bool theOn); void onMode2D(bool theOn); + void onSurfacesSettings(); + void onStartRecording(); void onPlayRecording(); void onPauseRecording(); @@ -393,14 +404,6 @@ protected: void createToolBar(); void createActions(SUIT_ResourceMgr* theResourceMgr); - enum { DumpId, FitAllId, FitRectId, ZoomId, PanId, GlobalPanId, - ChangeRotationPointId, RotationId, - FrontId, BackId, TopId, BottomId, LeftId, RightId, ResetId, - ViewTrihedronId, NonIsometric, GraduatedAxes, UpdateRate, - ProjectionModeId, ViewParametersId, SwitchInteractionStyleId, Mode2DId, - StartRecordingId, PlayRecordingId, PauseRecordingId, StopRecordingId }; - - SVTK_View* myView; //SVTK_MainWindow* myMainWindow; SVTK_ViewModelBase* myModel; diff --git a/src/SVTK/resources/SVTK_images.ts b/src/SVTK/resources/SVTK_images.ts index 9ac9e1b59..4014ba59c 100644 --- a/src/SVTK/resources/SVTK_images.ts +++ b/src/SVTK/resources/SVTK_images.ts @@ -33,6 +33,10 @@ ICON_SVTK_STYLE_SWITCH vtk_view_style_switch.png + + ICON_SVTK_SURFACES_SETTINGS + vtk_view_surfaces_settings.png + ICON_SVTK_RECORDING_START vtk_view_recording_start.png @@ -53,5 +57,9 @@ ICON_SVTK_MODE_2D vtk_view_mode_2d.png + + ICON_SVTK_MINUS + vtk_view_minus.png + diff --git a/src/SVTK/resources/SVTK_msg_en.ts b/src/SVTK/resources/SVTK_msg_en.ts index 9e00c762d..a31323cde 100644 --- a/src/SVTK/resources/SVTK_msg_en.ts +++ b/src/SVTK/resources/SVTK_msg_en.ts @@ -185,6 +185,14 @@ MNU_SVTK_MODE_2D Toggle 2D mode + + DSC_SVTK_SURFACES_SETTINGS + Change the surfaces settings + + + MNU_SVTK_SURFACES_SETTINGS + Surfaces settings + SVTK_CubeAxesDlg @@ -617,11 +625,26 @@ Please, refer to the documentation. Change background... - + + Plot3d_SetupSurfacesDlg + + SETUP_SURFACES + Setup surfaces + + + PARAMETERS + Parameters + + + TEXT + Text + + + Plot3d_ViewManager - PLOT3D_VIEW_TITLE - Plot3d scene:%M - viewer:%V + PLOT3D_VIEW_TITLE + Plot3d scene:%M - viewer:%V - + diff --git a/src/SVTK/resources/vtk_view_minus.png b/src/SVTK/resources/vtk_view_minus.png new file mode 100644 index 000000000..055182e1a Binary files /dev/null and b/src/SVTK/resources/vtk_view_minus.png differ diff --git a/src/SVTK/resources/vtk_view_surfaces_settings.png b/src/SVTK/resources/vtk_view_surfaces_settings.png new file mode 100644 index 000000000..53d4f2c31 Binary files /dev/null and b/src/SVTK/resources/vtk_view_surfaces_settings.png differ