0031713: Draw Harness, IVtkDraw - add commands ivtksetcolor, ivtkaxo, ivtkclose, ivtksettransparency

Added missing NULL checks before accessing GetInteractor().
Errors are now reported using Message::SendFail().
Not found actor names are now reported as syntax error instead of silently skipping them.

ivtkinit now accepts aguments -srgb and -msaa for overriding defaults.
Default MSAA settings have been changed from 8 to 0 to match vinit behavior.
Added command ivtkclose closing a Vtk view.

Added commands ivtkaxo, ivtkfront, ivtkback, ivtkleft, ivtkright,
ivtktop and ivtkbottom assigning view projection similar to sonamed commands in ViewerTest.

Added commands ivtksetcolor and ivtksettransparency assigning
color properties to shaded presentation.

src/IVtkDraw/IVtkDraw.hxx

@@ -26,19 +26,39 @@ class WNT_WClass;
 class IVtkDraw
 {
 public:
-
   DEFINE_STANDARD_ALLOC
 
-  Standard_EXPORT   static  void ViewerInit (Standard_Integer thePxLeft,
+  //! VTK window creation parameters.
-                                             Standard_Integer thePxTop,
+  struct IVtkWinParams
-                                             Standard_Integer thePxWidth,
+  {
-                                             Standard_Integer thePxHeight);
+    Graphic3d_Vec2i  TopLeft;
+    Graphic3d_Vec2i  Size;
+    Standard_Integer NbMsaaSample;
+    Standard_Boolean UseSRGBColorSpace;
 
-  Standard_EXPORT   static  void Factory (Draw_Interpretor& theDI);
+    IVtkWinParams() : NbMsaaSample (0), UseSRGBColorSpace (false) {}
-  Standard_EXPORT   static  void Commands (Draw_Interpretor& theCommands);
+  };
+
+public:
+
+  Standard_EXPORT static void ViewerInit (const IVtkWinParams& theParams);
+
+  static void ViewerInit (Standard_Integer thePxLeft,
+                          Standard_Integer thePxTop,
+                          Standard_Integer thePxWidth,
+                          Standard_Integer thePxHeight)
+  {
+    IVtkWinParams aParams;
+    aParams.TopLeft.SetValues (thePxLeft, thePxTop);
+    aParams.Size.SetValues (thePxWidth, thePxHeight);
+    ViewerInit (aParams);
+  }
+
+  Standard_EXPORT static void Factory (Draw_Interpretor& theDI);
+  Standard_EXPORT static void Commands (Draw_Interpretor& theCommands);
 
 private:
-  Standard_EXPORT   static const Handle(WNT_WClass)& WClass();
+  Standard_EXPORT static const Handle(WNT_WClass)& WClass();
 };
 
 #endif

src/IVtkDraw/IVtkDraw_Interactor.cxx

@@ -626,7 +626,7 @@ LRESULT CALLBACK WndProc (HWND theHWnd,UINT theUMsg,
   LRESULT aRes = 0;
   IVtkDraw_Interactor *anInteractor = 0;
 
-  anInteractor = (IVtkDraw_Interactor *)GetWindowLongPtr (theHWnd, GWLP_USERDATA);
+  anInteractor = (IVtkDraw_Interactor *)GetWindowLongPtrW (theHWnd, GWLP_USERDATA);
 
   if (anInteractor && anInteractor->GetReferenceCount() > 0)
   {
@@ -715,7 +715,7 @@ LRESULT CALLBACK ViewerWindowProc (HWND theHWnd,
     theInteractor->OnTimer (theHWnd, (UINT)theWParam);
     break;
   }
-  return DefWindowProc(theHWnd, theMsg, theWParam, theLParam);
+  return DefWindowProcW (theHWnd, theMsg, theWParam, theLParam);
 }
 
 #else

tests/v3d/ivtk/bgcolor

@@ -1,18 +1,11 @@
 puts "============"
-puts "bgcolor"
+puts "bgcolor: Tests changing of background color in the IVtk view"
 puts "============"
 puts ""
-#######################################################
-#  Tests changing of background color in the IVtk view
-#######################################################
-
-set anImage1 $imagedir/${casename}_1.png
-set anImage2 $imagedir/${casename}_2.png
 
 ivtkinit
 ivtkbgcolor 200 220 250
-ivtkdump $anImage1
+ivtkdump $imagedir/${casename}_1.png
 
 ivtkbgcolor 10 30 80 255 255 255
-ivtkdump $anImage2
+ivtkdump $imagedir/${casename}_2.png
-

tests/v3d/ivtk/boundary_draw

@@ -1,20 +1,14 @@
 puts "============="
-puts "boundary_draw"
+puts "boundary_draw: Tests boundary draw changing in the IVtk view"
 puts "============="
 puts ""
-#######################################################
-#  Tests boundary draw changing in the IVtk view
-#######################################################
 
-set anImage1 $imagedir/${casename}_1.png
-set anImage2 $imagedir/${casename}_2.png
-
-ivtkinit
 box b 1 1 1
+ivtkinit
 ivtkdisplay b
 ivtksetdispmode 1
 ivtksetboundingdraw 1
-ivtkdump $anImage1
+ivtkdump $imagedir/${casename}_1.png
 
 ivtksetboundingdraw 0
-ivtkdump $anImage2
+ivtkdump $imagedir/${casename}_2.png

tests/v3d/ivtk/detect

@@ -1,15 +1,11 @@
 puts "============"
-puts "detect"
+puts "detect: Tests detection of shapes in the IVtk view"
 puts "============"
 puts ""
-#######################################################
-#  Tests detection of shapes in the IVtk view
-#######################################################
 
-set anImage $imagedir/${casename}.png
-ivtkinit
 box b 1 1 1
+ivtkinit
 ivtkdisplay b
 ivtkmoveto 100 100
 
-ivtkdump $anImage
+ivtkdump $imagedir/${casename}.png

tests/v3d/ivtk/display_mode

@@ -1,19 +1,13 @@
 puts "============"
-puts "display_mode"
+puts "display_mode: Tests display modes changing in the IVtk view"
 puts "============"
 puts ""
-#######################################################
-#  Tests display modes changing in the IVtk view
-#######################################################
 
-set anImage1 $imagedir/${casename}_1.png
-set anImage2 $imagedir/${casename}_2.png
-
-ivtkinit
 box b 1 1 1
+ivtkinit
 ivtkdisplay b
 ivtksetdispmode 1
-ivtkdump $anImage1
+ivtkdump $imagedir/${casename}_1.png
 
 ivtksetdispmode 0
-ivtkdump $anImage2
+ivtkdump $imagedir/${casename}_2.png

tests/v3d/ivtk/erase

@@ -1,24 +1,17 @@
 puts "============"
-puts "erase"
+puts "erase: Tests erasing of shapes in the IVtk view"
 puts "============"
 puts ""
-#######################################################
-#  Tests erasing of shapes in the IVtk view
-#######################################################
 
-set anImage1 $imagedir/${casename}_before.png
-set anImage2 $imagedir/${casename}_oneErased.png
-set anImage3 $imagedir/${casename}_allErased.png
-
-ivtkinit
 box b1 1 1 1
 box b2 3 3 3 1 1 1
+ivtkinit
 ivtkdisplay b1 b2 
-ivtkdump $anImage1
+ivtkdump $imagedir/${casename}_before.png
 
 ivtkerase b1
-ivtkdump $anImage2
+ivtkdump $imagedir/${casename}_oneErased.png
 
 ivtkdisplay b1
 ivtkerase
-ivtkdump $anImage3
+ivtkdump $imagedir/${casename}_allErased.png

tests/v3d/ivtk/seam_edges

@@ -1,17 +1,12 @@
 puts "=========="
-puts "seam_edges"
+puts "seam_edges: Tests boundary edges draw without seam edges in the IVtk view"
 puts "=========="
 puts ""
-#################################################################
-#  Tests boundary edges draw without seam edges in the IVtk view
-#################################################################
 
-set anImage $imagedir/${casename}.png
-
-ivtkinit
 psphere s 10 15 80
+ivtkinit
 ivtkdisplay s
 ivtksetdispmode 1
 ivtksetboundingdraw 1
 
-ivtkdump $anImage
+ivtkdump $imagedir/${casename}.png

tests/v3d/ivtk/select

@@ -1,15 +1,11 @@
 puts "============"
-puts "select"
+puts "select: Tests selection of shapes in the IVtk view"
 puts "============"
 puts ""
-#######################################################
-#  Tests selection of shapes in the IVtk view
-#######################################################
 
-set anImage $imagedir/${casename}.png
-ivtkinit
 box b 1 1 1
+ivtkinit
 ivtkdisplay b
 ivtkselect 100 100
 
-ivtkdump $anImage
+ivtkdump $imagedir/${casename}.png

tests/v3d/ivtk/selection_mode

@@ -1,16 +1,12 @@
 puts "============"
-puts "selection_mode"
+puts "selection_mode: Tests selection modes changing in the IVtk view"
 puts "============"
 puts ""
-#######################################################
-#  Tests selection modes changing in the IVtk view
-#######################################################
 
-set anImage $imagedir/${casename}.png
-ivtkinit
 box b 1 1 1
+ivtkinit
 ivtkdisplay b
 ivtksetselmode 2 1
 ivtkselect 86 117
 
-ivtkdump $anImage
+ivtkdump $imagedir/${casename}.png