]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
refs #740 (p.1 + p.2)
authorisn <isn@opencascade.com>
Fri, 20 Nov 2015 09:27:01 +0000 (12:27 +0300)
committerisn <isn@opencascade.com>
Fri, 20 Nov 2015 09:27:01 +0000 (12:27 +0300)
src/HYDROData/HYDROData_SinusX.cxx
src/HYDROGUI/HYDROGUI_ImportSinusXOp.cxx

index 8f05a257c19fa75fff1725a527a614e3a86e4f6e..3927c0a348a1d9e2c7b833d1ffc074d5268298b9 100644 (file)
@@ -33,6 +33,7 @@
 #include <QString>
 #include <QStringList>
 #include <QTextStream>
+#include <QColor>
 
 HYDROData_SinusX::HYDROData_SinusX( ) 
 {
@@ -147,6 +148,7 @@ void HYDROData_SinusX::SXToHydro(Handle(HYDROData_Document) theDocument, NCollec
       aPolyXY->SetName(GetName(myCurveBlocks[i].myName + "_polyXY"));
       aProfileUZ->SetName(GetName(myCurveBlocks[i].myName + "_profileUZ"));
       aProfile->SetName(GetName(myCurveBlocks[i].myName + "_profile"));
+      aPolyXY->SetWireColor(HYDROData_PolylineXY::DefaultWireColor());
       theEntities.Append(aPolyXY);
       theEntities.Append(aProfileUZ);
       theEntities.Append(aProfile);
index d5c37eb54b2ada585b6717574c2ed463a9722e5e..4f30e80256c3ee52da222e821eadd0570ff4b6b4 100644 (file)
@@ -108,8 +108,7 @@ void HYDROGUI_ImportSinusXOp::onApply()
   else
     abort();
 
-  module()->update( UF_Model | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init );
-  
+  module()->update( UF_Model | UF_VTKViewer | UF_OCCViewer );  
   QApplication::restoreOverrideCursor();
 }
 
@@ -117,7 +116,7 @@ void HYDROGUI_ImportSinusXOp::UpdateView( NCollection_Sequence<Handle_HYDROData_
 {
   size_t anActiveViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() );
   if ( anActiveViewId == 0 )
-    anActiveViewId = HYDROGUI_Tool::GetActiveOCCViewId( module() );
+    anActiveViewId = HYDROGUI_Tool::GetActiveViewId( module() );
 
   for (int i = 1; i <= anEntities.Size() ; i++)
   {