From 882dc8f6ee23cedf50cf3c718fb864dec115b35e Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 14 Feb 2012 12:03:57 +0000 Subject: [PATCH] Implementation of the "21046: EDF 1610 GUI: To be able to change the width of the lines" issue. --- doc/salome/gui/GEOM/images/line_width.png | Bin 0 -> 4936 bytes doc/salome/gui/GEOM/images/line_width_1.png | Bin 0 -> 7790 bytes doc/salome/gui/GEOM/images/line_width_2.png | Bin 0 -> 7517 bytes doc/salome/gui/GEOM/input/line_width.doc | 18 ++ .../gui/GEOM/input/viewing_geom_obj.doc | 2 + resources/SalomeApp.xml.in | 5 + src/GEOMBase/GEOMBase_Helper.cxx | 8 +- src/GEOMGUI/GEOM_Displayer.cxx | 81 +++++- src/GEOMGUI/GEOM_Displayer.h | 6 + src/GEOMGUI/GEOM_msg_en.ts | 61 ++++- src/GEOMGUI/GeometryGUI.cxx | 53 +++- src/GEOMGUI/GeometryGUI_Operations.h | 2 + src/GEOMToolsGUI/GEOMToolsGUI.cxx | 6 + src/GEOMToolsGUI/GEOMToolsGUI.h | 2 + src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 257 +++++++++++++++++- .../GEOMToolsGUI_LineWidthDlg.cxx | 192 +++++++++++++ src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h | 59 ++++ src/GEOMToolsGUI/Makefile.am | 9 +- src/MeasureGUI/MeasureGUI.h | 6 + src/MeasureGUI/MeasureGUI_AngleDlg.cxx | 4 + .../MeasureGUI_CheckCompoundOfBlocksDlg.cxx | 9 +- src/MeasureGUI/MeasureGUI_DistanceDlg.cxx | 4 + src/MeasureGUI/MeasureGUI_NormaleDlg.cxx | 7 +- src/OBJECT/GEOM_Actor.cxx | 33 +++ src/OBJECT/GEOM_Actor.h | 12 + src/OBJECT/GEOM_Constants.h | 2 + 26 files changed, 815 insertions(+), 23 deletions(-) create mode 100755 doc/salome/gui/GEOM/images/line_width.png create mode 100755 doc/salome/gui/GEOM/images/line_width_1.png create mode 100755 doc/salome/gui/GEOM/images/line_width_2.png create mode 100644 doc/salome/gui/GEOM/input/line_width.doc create mode 100644 src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx create mode 100644 src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h diff --git a/doc/salome/gui/GEOM/images/line_width.png b/doc/salome/gui/GEOM/images/line_width.png new file mode 100755 index 0000000000000000000000000000000000000000..bf5c713a8280e9c44f130a6fd83418762e49d0ca GIT binary patch literal 4936 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 GsQ&=f6Ot+b literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/images/line_width_1.png b/doc/salome/gui/GEOM/images/line_width_1.png new file mode 100755 index 0000000000000000000000000000000000000000..e7fc005f2005f470fe9465185a9e92cdaeffae56 GIT binary patch literal 7790 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 PfG;a^TUx29=lTBu6s6S- literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/input/line_width.doc b/doc/salome/gui/GEOM/input/line_width.doc new file mode 100644 index 000000000..3850a8dcd --- /dev/null +++ b/doc/salome/gui/GEOM/input/line_width.doc @@ -0,0 +1,18 @@ +/*! + +\page line_width_page Line Width + +\n In this menu you can change the width of the edges and isolines displayed within +a shape. + +\n Arguments: 1 value (width of the edge or isoline). + +\image html line_width.png + +\n Example: + +\image html line_width_1.png + +\image html line_width_2.png + +*/ diff --git a/doc/salome/gui/GEOM/input/viewing_geom_obj.doc b/doc/salome/gui/GEOM/input/viewing_geom_obj.doc index 9ff681259..b269619a9 100644 --- a/doc/salome/gui/GEOM/input/viewing_geom_obj.doc +++ b/doc/salome/gui/GEOM/input/viewing_geom_obj.doc @@ -33,6 +33,8 @@ deflection coefficient of a shape. material properties of a shape.
  • \subpage point_marker_page "Point Marker" - allows to change the representation of geometrical vertices.
    • +
  • \subpage line_width_page "Line Width" - allows to change the +width of the edges and isolines.
  • Auto color / Disable auto color - activates the auto color mode. When the auto color mode is enabled, the groups created on the sub-shapes of the selected geometrical object are automatically diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index 8ea7476e7..f910e6569 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -57,6 +57,11 @@ + + + + + diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index 50c5c46e6..04a0be7b4 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -317,7 +318,12 @@ void GEOMBase_Helper::displayPreview( GEOM::GEOM_Object_ptr object, getDisplayer()->SetColor( color == -1 ? Quantity_NOC_VIOLET : color ); // set width of displayed shape - getDisplayer()->SetWidth( lineWidth ); + int lw = lineWidth; + if(lw == -1) { + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + lw = resMgr->integerValue("Geometry", "preview_edge_width", -1); + } + getDisplayer()->SetWidth( lw ); // set display mode of displayed shape int aPrevDispMode = getDisplayer()->SetDisplayMode( displayMode ); diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 31d7d4b0c..8d7bb7603 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -313,7 +313,11 @@ GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st ) myShadingColor = SalomeApp_Tools::color( col ); myDisplayMode = resMgr->integerValue("Geometry", "display_mode", 0); + int aType = resMgr->integerValue("Geometry", "type_of_marker", (int)Aspect_TOM_PLUS); + myWidth = resMgr->integerValue("Geometry", "edge_width", -1); + myIsosWidth = resMgr->integerValue("Geometry", "isolines_width", -1); + myTypeOfMarker = (Aspect_TypeOfMarker)(std::min((int)Aspect_TOM_RING3, std::max((int)Aspect_TOM_POINT, aType))); myScaleOfMarker = (resMgr->integerValue("Geometry", "marker_scale", 1)-(int)GEOM::MS_10)*0.5 + 1.0; myScaleOfMarker = std::min(7.0, std::max(1., myScaleOfMarker)); @@ -696,10 +700,15 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) Handle(Prs3d_IsoAspect) anAspect = AISShape->Attributes()->UIsoAspect(); anAspect->SetNumber( anUIsoNumber ); anAspect->SetColor( aColor ); + if(HasIsosWidth()) + anAspect->SetWidth( GetIsosWidth() ); AISShape->Attributes()->SetUIsoAspect( anAspect ); + anAspect = AISShape->Attributes()->VIsoAspect(); anAspect->SetNumber( aVIsoNumber ); + if(HasIsosWidth()) + anAspect->SetWidth( GetIsosWidth() ); anAspect->SetColor( aColor ); AISShape->Attributes()->SetVIsoAspect( anAspect ); @@ -828,6 +837,8 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) double aDC = 0; if(useStudy) { aDC = aPropMap.value(DEFLECTION_COEFF_PROP).toDouble(); + SetWidth(aPropMap.value(EDGE_WIDTH_PROP).toInt()); + SetIsosWidth(aPropMap.value(ISOS_WIDTH_PROP).toInt()); } else { aDC = aResMgr->doubleValue("Geometry", "deflection_coeff", 0.001); @@ -1003,6 +1014,13 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs ) if ( aModelB ) delete aModelB; + if(HasWidth()) + aStudy->setObjectProperty( aMgrId, anIO->getEntry(), EDGE_WIDTH_PROP, GetWidth() ); + + if(HasIsosWidth()) + aStudy->setObjectProperty( aMgrId, anIO->getEntry(), ISOS_WIDTH_PROP, GetIsosWidth() ); + + } // AISShape->SetName(???); ??? necessary to set name ??? @@ -1133,11 +1151,6 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) aProp->SetColor( aColor.Red(), aColor.Green(), aColor.Blue() ); } - if ( HasWidth() ) - { - aProp->SetLineWidth( GetWidth() ); - } - while ( anActor != NULL ) { SALOME_Actor* GActor = SALOME_Actor::SafeDownCast( anActor ); @@ -1172,6 +1185,8 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) aIsos[0] = uv[0].toInt(); aIsos[1] = uv[1].toInt(); aGeomGActor->SetNbIsos(aIsos); aGeomGActor->SetOpacity(1.0 - aPropMap.value(TRANSPARENCY_PROP).toDouble()); + SetWidth(aPropMap.value(EDGE_WIDTH_PROP).toInt()); + SetIsosWidth(aPropMap.value(ISOS_WIDTH_PROP).toInt()); aGeomGActor->SetVectorMode(aPropMap.value(VECTOR_MODE_PROP).toInt()); int aDispModeId = aPropMap.value(DISPLAY_MODE_PROP).toInt(); // Specially processing of 'Shading with edges' mode from preferences, @@ -1217,6 +1232,13 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) // Release memory delete aModelB; + + if(HasWidth()) + aStudy->setObjectProperty( aMgrId, anEntry, EDGE_WIDTH_PROP, GetWidth() ); + + if(HasIsosWidth()) + aStudy->setObjectProperty( aMgrId, anEntry, ISOS_WIDTH_PROP, GetIsosWidth() ); + } else { // Set the same front and back materials for the selected shape @@ -1292,6 +1314,17 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs ) } } + if ( HasWidth() ) + { + aGeomGActor->SetWidth( GetWidth() ); + } + + + if ( HasIsosWidth() ) + { + aGeomGActor->SetIsosWidth( GetIsosWidth() ); + } + if ( myToActivate ) GActor->PickableOn(); else @@ -1760,6 +1793,23 @@ void GEOM_Displayer::UnsetWidth() myWidth = -1; } + +int GEOM_Displayer::GetIsosWidth() const +{ + return myIsosWidth; +} + +void GEOM_Displayer::SetIsosWidth(const int width) +{ + myIsosWidth = width; +} + +bool GEOM_Displayer::HasIsosWidth() const +{ + return myIsosWidth != -1; +} + + //================================================================= /*! * GEOM_Displayer::SetToActivate @@ -1962,12 +2012,20 @@ PropMap GEOM_Displayer::getDefaultPropertyMap(const QString& viewer_type) { QString aMaterialF = aModelF.getMaterialProperty(); aDefaultMap.insert( FRONT_MATERIAL_PROP , aMaterialF ); - // Back material + //9. Back material Material_Model aModelB; aModelB.fromResources( aResMgr, "Geometry", false ); QString aMaterialB = aModelB.getMaterialProperty(); aDefaultMap.insert( BACK_MATERIAL_PROP , aMaterialB ); + //10. Width of the edges + aDefaultMap.insert( EDGE_WIDTH_PROP , aResMgr->integerValue("Geometry", "edge_width", 1)); + + + //11. Width of iso-lines + aDefaultMap.insert( ISOS_WIDTH_PROP , aResMgr->integerValue("Geometry", "isolines_width", 1)); + + return aDefaultMap; } @@ -2005,6 +2063,17 @@ bool GEOM_Displayer::MergePropertyMaps(PropMap& theOrigin, PropMap& theDefault) theOrigin.insert(BACK_MATERIAL_PROP, theDefault.value(BACK_MATERIAL_PROP)); nbInserted++; } + + if(!theOrigin.contains(EDGE_WIDTH_PROP)) { + theOrigin.insert(EDGE_WIDTH_PROP, theDefault.value(EDGE_WIDTH_PROP)); + nbInserted++; + } + + if(!theOrigin.contains(ISOS_WIDTH_PROP)) { + theOrigin.insert(ISOS_WIDTH_PROP, theDefault.value(ISOS_WIDTH_PROP)); + nbInserted++; + } + return (nbInserted > 0); } diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index 30337eaac..c7ced1329 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -134,6 +134,11 @@ public: void UnsetWidth(); double GetWidth () const; bool HasWidth () const; + + /* Set width for iso-lines displaying. If it is equal -1 then default width is used. */ + void SetIsosWidth ( const int ); + int GetIsosWidth () const; + bool HasIsosWidth () const; /* Set display mode shape displaying. If it is equal -1 then display mode is used. */ int SetDisplayMode( const int ); @@ -215,6 +220,7 @@ protected: Quantity_Color myShadingColor; int myColor; double myWidth; + int myIsosWidth; bool myToActivate; int myDisplayMode; Aspect_TypeOfMarker myTypeOfMarker; diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 14a87c7aa..a993e8be3 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -11,6 +11,14 @@ CHANGE_ORIENTATION_NEW_OBJ_NAME Invert + + EDGE_WIDTH_TLT + Select Edge Width + + + ISOS_WIDTH_TLT + Select Isos Width + CLOSE_CONTOUR_NEW_OBJ_NAME CloseContour @@ -2574,6 +2582,34 @@ Please, select face, shell or solid and try again MEN_POP_TEXTURE Texture + + MEN_EDGE_WIDTH + Edge Width + + + TOP_EDGE_WIDTH + Edge Width + + + STB_EDGE_WIDTH + Edge Width + + + MEN_ISOS_WIDTH + Isos Width + + + TOP_ISOS_WIDTH + Isos Width + + + STB_ISOS_WIDTH + Isos Width + + + MEN_LINE_WIDTH + Line Width + MEN_POP_SETTEXTURE Texture @@ -2906,6 +2942,22 @@ Please, select face, shell or solid and try again PREF_BACK_MATERIAL Default back material + + PREF_EDGE_WIDTH + Edges width + + + PREF_ISOLINES_WIDTH + Iso lines width + + + PREF_PREVIEW_EDGE_WIDTH + Preview edges width + + + PREF_MEASURES_LINE_WIDTH + Measures lines width + PROCESS_SHAPE_NEW_OBJ_NAME ProcessShape @@ -4779,7 +4831,7 @@ Number of sketch points too small EMPTY_NAME Please, specify a non-empty group name - + GROUP_NAME Group Name @@ -5003,6 +5055,13 @@ Would you like to continue? Deflection : + + GEOMToolsGUI_LineWidthDlg + + GEOM_LINE_WIDTH + Line width: + + GEOMToolsGUI_MarkerDlg diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index cfa64c465..a230d3725 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -424,6 +424,8 @@ void GeometryGUI::OnGUIEvent( int id ) case GEOMOp::OpPublishObject: // ROOT GEOM OBJECT - POPUP MENU - PUBLISH case GEOMOp::OpPointMarker: // POPUP MENU - POINT MARKER case GEOMOp::OpMaterialProperties: // POPUP MENU - MATERIAL PROPERTIES + case GEOMOp::OpEdgeWidth: // POPUP MENU - LINE WIDTH - EDGE WIDTH + case GEOMOp::OpIsosWidth: // POPUP MENU - LINE WIDTH - ISOS WIDTH libName = "GEOMToolsGUI"; break; case GEOMOp::OpDisplayMode: // MENU VIEW - WIREFRAME/SHADING @@ -844,6 +846,8 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( GEOMOp::OpShading, "POP_SHADING", "", 0, true ); createGeomAction( GEOMOp::OpShadingWithEdges, "POP_SHADING_WITH_EDGES", "", 0, true ); createGeomAction( GEOMOp::OpTexture, "POP_TEXTURE", "", 0, true ); + createGeomAction( GEOMOp::OpEdgeWidth, "EDGE_WIDTH"); + createGeomAction( GEOMOp::OpIsosWidth, "ISOS_WIDTH"); createGeomAction( GEOMOp::OpVectors, "POP_VECTORS", "", 0, true ); createGeomAction( GEOMOp::OpDeflection, "POP_DEFLECTION" ); createGeomAction( GEOMOp::OpColor, "POP_COLOR" ); @@ -1234,6 +1238,14 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->setRule( action( GEOMOp::OpMaterialProperties ), clientOCCorVTK_AndSomeVisible + " and ($component={'GEOM'}) and selcount>0 and isVisible", QtxPopupMgr::VisibleRule ); mgr->insert( action( GEOMOp::OpSetTexture ), -1, -1 ); // texture mgr->setRule( action( GEOMOp::OpSetTexture ), clientOCCorOB_AndSomeVisible + " and ($component={'GEOM'})", QtxPopupMgr::VisibleRule ); + + int lineW = mgr->insert( tr( "MEN_LINE_WIDTH" ), -1, -1 ); // line width menu + mgr->insert( action( GEOMOp::OpEdgeWidth ), lineW, -1 ); // edge width + mgr->setRule( action( GEOMOp::OpEdgeWidth ), clientOCCorVTK_AndSomeVisible, QtxPopupMgr::VisibleRule ); + + mgr->insert( action( GEOMOp::OpIsosWidth ), lineW, -1 ); // isos width + mgr->setRule( action( GEOMOp::OpIsosWidth ), clientOCCorVTK_AndSomeVisible, QtxPopupMgr::VisibleRule ); + mgr->insert( separator(), -1, -1 ); // ----------- mgr->insert( action( GEOMOp::OpAutoColor ), -1, -1 ); // auto color mgr->setRule( action( GEOMOp::OpAutoColor ), autoColorPrefix + " and isAutoColor=false", QtxPopupMgr::VisibleRule ); @@ -1679,11 +1691,33 @@ void GeometryGUI::createPreferences() int front_material = addPreference( tr( "PREF_FRONT_MATERIAL" ), genGroup, LightApp_Preferences::Selector, "Geometry", "front_material" ); - + int back_material = addPreference( tr( "PREF_BACK_MATERIAL" ), genGroup, LightApp_Preferences::Selector, "Geometry", "back_material" ); + int nb = 4; + int wd[nb]; + int iter=0; + + wd[iter++] = addPreference( tr( "PREF_EDGE_WIDTH" ), genGroup, + LightApp_Preferences::IntSpin, "Geometry", "edge_width" ); + + wd[iter++] = addPreference( tr( "PREF_ISOLINES_WIDTH" ), genGroup, + LightApp_Preferences::IntSpin, "Geometry", "isolines_width" ); + + wd[iter++] = addPreference( tr( "PREF_PREVIEW_EDGE_WIDTH" ), genGroup, + LightApp_Preferences::IntSpin, "Geometry", "preview_edge_width" ); + + wd[iter++] = addPreference( tr( "PREF_MEASURES_LINE_WIDTH" ), genGroup, + LightApp_Preferences::IntSpin, "Geometry", "measures_line_width" ); + + for(int i = 0; i < nb; i++) { + setPreferenceProperty( wd[i], "min", 1 ); + setPreferenceProperty( wd[i], "max", 5 ); + } + + // Quantities with individual precision settings int precGroup = addPreference( tr( "GEOM_PREF_GROUP_PRECISION" ), tabId ); setPreferenceProperty( precGroup, "columns", 2 ); @@ -1950,6 +1984,17 @@ void GeometryGUI::storeVisualParameters (int savePoint) if(aProps.contains(BACK_MATERIAL_PROP)) { param = occParam + BACK_MATERIAL_PROP; ip->setParameter(entry, param, aProps.value(BACK_MATERIAL_PROP).toString().toLatin1().data()); + + } + + if(aProps.contains( EDGE_WIDTH_PROP )) { + param = occParam + EDGE_WIDTH_PROP; + ip->setParameter(entry, param, aProps.value(EDGE_WIDTH_PROP).toString().toLatin1().data()); + } + + if(aProps.contains( ISOS_WIDTH_PROP )) { + param = occParam + ISOS_WIDTH_PROP; + ip->setParameter(entry, param, aProps.value(ISOS_WIDTH_PROP).toString().toLatin1().data()); } } // object iterator } // for (views) @@ -2062,8 +2107,14 @@ void GeometryGUI::restoreVisualParameters (int savePoint) aListOfMap[viewIndex].insert( FRONT_MATERIAL_PROP, val); } else if(paramNameStr == BACK_MATERIAL_PROP) { aListOfMap[viewIndex].insert( BACK_MATERIAL_PROP, val); + } else if(paramNameStr == EDGE_WIDTH_PROP) { + aListOfMap[viewIndex].insert( EDGE_WIDTH_PROP , val); + } else if(paramNameStr == ISOS_WIDTH_PROP) { + aListOfMap[viewIndex].insert( ISOS_WIDTH_PROP , val); } + + } // for names/parameters iterator QList lst = getApp()->viewManagers(); diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index 5ff8d5921..227c23283 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -54,6 +54,8 @@ namespace GEOMOp { OpHideChildren = 1251, // POPUP MENU - HIDE CHILDREN OpUnpublishObject = 1253, // POPUP MENU - UNPUBLISH OpPublishObject = 1254, // GEOM ROOT OBJECT - POPUP MENU - PUBLISH + OpEdgeWidth = 1260, // POPUP MENU - LINE WIDTH - EDGE WIDTH + OpIsosWidth = 1261, // POPUP MENU - LINE WIDTH - ISOS WIDTH // DisplayGUI ----------------//-------------------------------- OpDisplayMode = 2000, // MENU VIEW - DISPLAY MODE - WIREFRAME/SHADING/SHADING WITH EDGES diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index f1abd61d0..3c5c6f1d1 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -371,6 +371,12 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) case GEOMOp::OpPublishObject:// GEOM ROOT OBJECT - POPUP - PUBLISH OnPublishObject(); break; + case GEOMOp::OpEdgeWidth: + OnEdgeWidth(); + break; + case GEOMOp::OpIsosWidth: + OnIsosWidth(); + break; default: SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); break; diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h index 5706765f0..2141f0c97 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI.h @@ -76,6 +76,8 @@ private: void OnPublishObject() ; void OnPointMarker(); void OnMaterialProperties(); + void OnEdgeWidth(); + void OnIsosWidth(); // Shortcut commands void OnChangeTransparency( bool ); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 8420eb5cd..31b734b33 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -32,6 +32,7 @@ #include "GEOMToolsGUI_MarkerDlg.h" #include "GEOMToolsGUI_PublishDlg.h" #include "GEOMToolsGUI_MaterialPropertiesDlg.h" +#include "GEOMToolsGUI_LineWidthDlg.h" #include #include @@ -79,6 +80,7 @@ #include #include #include +#include #if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 #include @@ -392,7 +394,6 @@ void GEOMToolsGUI::OnTexture() if ( !selected.IsEmpty() ) { SUIT_ViewWindow* window = app->desktop()->activeWindow(); bool isOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); - int mgrId = window->getViewManager()->getGlobalId(); if ( isOCC ) { QString aTexture = QFileDialog::getOpenFileName(window,tr( "GEOM_SELECT_IMAGE"),QString(), tr("OCC_IMAGE_FILES")); if( !aTexture.isEmpty() ) @@ -563,12 +564,17 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType ) } for(; ic->MoreCurrent(); ic->NextCurrent()) { + int aMgrId = window->getViewManager()->getGlobalId(); CurObject = Handle(GEOM_AISShape)::DownCast(ic->Current()); Handle(AIS_Drawer) CurDrawer = CurObject->Attributes(); - CurDrawer->SetUIsoAspect( new Prs3d_IsoAspect(Quantity_NOC_GRAY75, Aspect_TOL_SOLID, 0.5 , newNbUIso) ); - CurDrawer->SetVIsoAspect( new Prs3d_IsoAspect(Quantity_NOC_GRAY75, Aspect_TOL_SOLID, 0.5 , newNbVIso) ); + QVariant v = aStudy->getObjectProperty( aMgrId, CurObject->getIO()->getEntry(), EDGE_WIDTH_PROP , QVariant() ); + + int width = v.isValid() ? v.toInt() : 1; + + CurDrawer->SetUIsoAspect( new Prs3d_IsoAspect(Quantity_NOC_GRAY75, Aspect_TOL_SOLID, width , newNbUIso) ); + CurDrawer->SetVIsoAspect( new Prs3d_IsoAspect(Quantity_NOC_GRAY75, Aspect_TOL_SOLID, width , newNbVIso) ); CurObject->storeIsoNumbers(); @@ -576,8 +582,7 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType ) ic->Redisplay(CurObject); QString anIsos("%1%2%3");anIsos = anIsos.arg(newNbUIso);anIsos = anIsos.arg(DIGIT_SEPARATOR);anIsos = anIsos.arg(newNbVIso); - int aMgrId = window->getViewManager()->getGlobalId(); - aStudy->setObjectProperty(aMgrId ,CurObject->getIO()->getEntry(), ISOS_PROP, anIsos); + aStudy->setObjectProperty(aMgrId ,CurObject->getIO()->getEntry(), ISOS_WIDTH_PROP, anIsos); } } GeometryGUI::Modified(); @@ -940,3 +945,245 @@ void GEOMToolsGUI::OnPublishObject() { new GEOMToolsGUI_PublishDlg( SUIT_Session::session()->activeApplication()->desktop() ); publishDlg->exec(); } + + +void GEOMToolsGUI::OnEdgeWidth() +{ + SUIT_ViewWindow* window = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); + SalomeApp_Study* appStudy = dynamic_cast( SUIT_Session::session()->activeApplication()->activeStudy() ); + + + bool isOCC = (window && window->getViewManager()->getType() == OCCViewer_Viewer::Type()); + bool isVTK = (window && window->getViewManager()->getType() == SVTK_Viewer::Type()); + int mgrId = window->getViewManager()->getGlobalId(); + + if (isOCC) { // if is OCCViewer + OCCViewer_Viewer* vm = dynamic_cast(window->getViewManager()->getViewModel()); + Handle (AIS_InteractiveContext) ic = vm->getAISContext(); + ic->InitCurrent(); + if (ic->MoreCurrent()) { + Handle(GEOM_AISShape) CurObject = Handle(GEOM_AISShape)::DownCast(ic->Current()); + + int aWidth = (int)CurObject->Width(); + + GEOMToolsGUI_LineWidthDlg * Dlg = new GEOMToolsGUI_LineWidthDlg + (SUIT_Session::session()->activeApplication()->desktop(),"EDGE_WIDTH_TLT"); + Dlg->setTheLW(aWidth); + int aNewWidth = 0; + if (Dlg->exec()) { + aNewWidth = Dlg->getTheLW(); + bool ok = (aNewWidth != aWidth && aNewWidth != 0 ); + if (ok) { + for(; ic->MoreCurrent(); ic->NextCurrent()) { + CurObject = Handle(GEOM_AISShape)::DownCast(ic->Current()); + CurObject->SetWidth(aNewWidth); + ic->Redisplay(CurObject); + appStudy->setObjectProperty(mgrId,CurObject->getIO()->getEntry(), EDGE_WIDTH_PROP, aNewWidth); + } + } + } + } + else { + return; + } + GeometryGUI::Modified(); + } + else if (isVTK) { // if is VTKViewer + SalomeApp_Application* app = dynamic_cast + (SUIT_Session::session()->activeApplication()); + if (!app) + return; + + LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); + if (!aSelMgr) + return; + + SALOME_ListIO selected; + aSelMgr->selectedObjects(selected); + if (selected.IsEmpty()) + return; + + SVTK_ViewWindow* vtkVW = dynamic_cast(window); + if (!vtkVW) + return; + + SALOME_View* view = GEOM_Displayer::GetActiveView(); + + vtkActorCollection* aCollection = vtkActorCollection::New(); + + for (SALOME_ListIteratorOfListIO It (selected); It.More(); It.Next()) { + Handle(SALOME_InteractiveObject) anIObject = It.Value(); + SALOME_Prs* aPrs = view->CreatePrs(anIObject->getEntry()); + SVTK_Prs* vtkPrs = dynamic_cast(aPrs); + if (vtkPrs) { + vtkActorCollection* anActors = vtkPrs->GetObjects(); + anActors->InitTraversal(); + vtkActor* anAct = anActors->GetNextActor(); + aCollection->AddItem(anAct); + } + } + + if (aCollection) + aCollection->InitTraversal(); + else + return; + + int aWidth = 1; + + vtkActor* anAct = aCollection->GetNextActor(); + if (GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(anAct)) + aWidth = anActor->GetWidth(); + else + return; + + GEOMToolsGUI_LineWidthDlg * Dlg = new GEOMToolsGUI_LineWidthDlg + (SUIT_Session::session()->activeApplication()->desktop(),"EDGE_WIDTH_TLT"); + + Dlg->setTheLW(aWidth); + if (Dlg->exec()) { + SUIT_OverrideCursor(); + aWidth = Dlg->getTheLW(); + while (anAct != NULL) { + if (GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(anAct)) { + // There are no casting to needed actor. + anActor->SetWidth(aWidth); + appStudy->setObjectProperty(mgrId, anActor->getIO()->getEntry(), EDGE_WIDTH_PROP, aWidth); + } + anAct = aCollection->GetNextActor(); + } + } + GeometryGUI::Modified(); + } // end vtkviewer +} + + +void GEOMToolsGUI::OnIsosWidth() { + SalomeApp_Application* app = + dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); + SalomeApp_Study* aStudy = dynamic_cast( app->activeStudy() ); + SUIT_ViewWindow* window = app->desktop()->activeWindow(); + + bool isOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); + bool isVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() ); + + if(isOCC){ // if is OCCViewer + + OCCViewer_Viewer* vm = dynamic_cast( window->getViewManager()->getViewModel() ); + Handle (AIS_InteractiveContext) ic = vm->getAISContext(); + + ic->InitCurrent(); + if ( ic->MoreCurrent() ) { + Handle(GEOM_AISShape) CurObject = Handle(GEOM_AISShape)::DownCast(ic->Current()); + CurObject->restoreIsoNumbers(); + Handle(AIS_Drawer) CurDrawer = CurObject->Attributes(); + + Handle(Graphic3d_AspectLine3d) asp = CurDrawer->UIsoAspect()->Aspect(); + + Quantity_Color C; + Aspect_TypeOfLine T; + Standard_Real W; + asp->Values(C,T,W); + + int aWidth = (int)W; + + GEOMToolsGUI_LineWidthDlg * Dlg = + new GEOMToolsGUI_LineWidthDlg( SUIT_Session::session()->activeApplication()->desktop(),"ISOS_WIDTH_TLT" ); + + Dlg->setTheLW( aWidth ); + + if ( Dlg->exec() ) { + SUIT_OverrideCursor(); + aWidth = Dlg->getTheLW(); + } else //Cancel case + return; + + for(; ic->MoreCurrent(); ic->NextCurrent()) { + int aMgrId = window->getViewManager()->getGlobalId(); + CurObject = Handle(GEOM_AISShape)::DownCast(ic->Current()); + + Handle(AIS_Drawer) CurDrawer = CurObject->Attributes(); + + CurObject->Attributes()->UIsoAspect()->SetWidth(aWidth); + CurObject->Attributes()->VIsoAspect()->SetWidth(aWidth); + + ic->Redisplay(CurObject); + + aStudy->setObjectProperty(aMgrId ,CurObject->getIO()->getEntry(), ISOS_WIDTH_PROP, aWidth); + } + GeometryGUI::Modified(); + } + } + else if(isVTK){ // if is VTKViewer + // + // Warning. It's works incorrect. must be recheked. + // + SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* > + ( SUIT_Session::session()->activeApplication() ); + if ( !app ) + return; + LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); + if ( !aSelMgr ) + return; + SALOME_ListIO selected; + aSelMgr->selectedObjects( selected ); + if ( selected.IsEmpty() ) + return; + + SVTK_ViewWindow* vtkVW = dynamic_cast( window ); + if ( !vtkVW ) + return; + + SALOME_View* view = GEOM_Displayer::GetActiveView(); + + vtkActorCollection* aCollection = vtkActorCollection::New(); + + for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { + Handle(SALOME_InteractiveObject) anIObject = It.Value(); + SALOME_Prs* aPrs = view->CreatePrs( anIObject->getEntry() ); + SVTK_Prs* vtkPrs = dynamic_cast( aPrs ); + if ( vtkPrs ) { + vtkActorCollection* anActors = vtkPrs->GetObjects(); + anActors->InitTraversal(); + vtkActor* anAct = anActors->GetNextActor(); + aCollection->AddItem(anAct); + } + } + + if(aCollection) + aCollection->InitTraversal(); + else + return; + + int aWidth = 1; + + vtkActor* anAct = aCollection->GetNextActor(); + if (GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(anAct)) { + aWidth = anActor->GetIsosWidth(); + } + else + return; + + GEOMToolsGUI_LineWidthDlg* Dlg = + new GEOMToolsGUI_LineWidthDlg( SUIT_Session::session()->activeApplication()->desktop(), "ISOS_WIDTH_TLT" ); + + Dlg->setTheLW( aWidth ); + if (Dlg->exec() ) { + SUIT_OverrideCursor(); + aWidth = Dlg->getTheLW(); + } else + return; //Cancel case + + while( anAct!= NULL ) { + if(GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(anAct)) { + // There are no casting to needed actor. + anActor->SetIsosWidth(aWidth); + int aMgrId = window->getViewManager()->getGlobalId(); + aStudy->setObjectProperty(aMgrId ,anActor->getIO()->getEntry(), ISOS_WIDTH_PROP, aWidth); + } + anAct = aCollection->GetNextActor(); + } + + view->Repaint(); + GeometryGUI::Modified(); + } // end vtkviewer +} diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx new file mode 100644 index 000000000..49c845da2 --- /dev/null +++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx @@ -0,0 +1,192 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// 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 +// + +// GEOM GEOMGUI : GUI for Geometry component +// File : GEOMToolsGUI_LineWidthDlg.cxx +// Author : OCC Team +// +#include "GEOMToolsGUI_LineWidthDlg.h" +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +//================================================================================= +// class : GEOMToolsGUI_LineWidthDlg() +// purpose : Constructs a GEOMToolsGUI_LineWidthDlg which is a child of 'parent', with the +// name 'name' and widget flags set to 'f'. +// The dialog will by default be modeless, unless you set 'modal' to +// TRUE to construct a modal dialog. +//================================================================================= + +GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QString& title) + : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint) +{ + setObjectName("GEOMToolsGUI_LineWidthDlg"); + setModal(true); + + setWindowTitle(tr(title.toLatin1().constData())); + setSizeGripEnabled(TRUE); + QGridLayout* MyDialogLayout = new QGridLayout(this); + MyDialogLayout->setSpacing(6); + MyDialogLayout->setMargin(11); + + + /***************************************************************/ + QGroupBox* GroupC1 = new QGroupBox (this); + GroupC1->setObjectName("GroupC1"); + QGridLayout* GroupC1Layout = new QGridLayout (GroupC1); + GroupC1Layout->setAlignment(Qt::AlignTop); + GroupC1Layout->setSpacing(6); + GroupC1Layout->setMargin(11); + + QLabel* TextLabel1 = new QLabel (GroupC1); + TextLabel1->setObjectName("TextLabel1"); + TextLabel1->setText(tr("GEOM_LINE_WIDTH")); + GroupC1Layout->addWidget(TextLabel1, 0, 0); + + + mySpinBox = new SalomeApp_IntSpinBox (GroupC1); + mySpinBox->setRange( 1, 5 ); + mySpinBox->setSingleStep( 1 ); + + mySpinBox->setObjectName("SpinBoxU"); + mySpinBox->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); + mySpinBox->setValue(1); + GroupC1Layout->addWidget(mySpinBox, 0, 1); + + + /***************************************************************/ + QGroupBox* GroupButtons = new QGroupBox (this); + GroupButtons->setObjectName("GroupButtons"); + QGridLayout* GroupButtonsLayout = new QGridLayout (GroupButtons); + GroupButtonsLayout->setAlignment(Qt::AlignTop); + GroupButtonsLayout->setSpacing(6); + GroupButtonsLayout->setMargin(11); + + QPushButton* buttonOk = new QPushButton (GroupButtons); + buttonOk->setObjectName("buttonOk"); + buttonOk->setText(tr("GEOM_BUT_OK")); + buttonOk->setAutoDefault(TRUE); + buttonOk->setDefault(TRUE); + GroupButtonsLayout->addWidget(buttonOk, 0, 0); + + GroupButtonsLayout->addItem(new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1); + + QPushButton* buttonCancel = new QPushButton (GroupButtons); + buttonCancel->setObjectName("buttonCancel"); + buttonCancel->setText(tr("GEOM_BUT_CANCEL")); + buttonCancel->setAutoDefault(TRUE); + GroupButtonsLayout->addWidget(buttonCancel, 0, 1); + + QPushButton* buttonHelp = new QPushButton (GroupButtons); + buttonHelp->setObjectName("buttonHelp"); + buttonHelp->setText(tr("GEOM_BUT_HELP")); + buttonHelp->setAutoDefault(TRUE); + GroupButtonsLayout->addWidget(buttonHelp, 0, 2); + /***************************************************************/ + + MyDialogLayout->addWidget(GroupC1, 0, 0); + MyDialogLayout->addWidget(GroupButtons, 1, 0); + + myHelpFileName = "line_width_page.html"; + + // signals and slots connections + connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept())); + connect(buttonCancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(buttonHelp, SIGNAL(clicked()), this, SLOT(ClickOnHelp())); + + // Move widget on the botton right corner of main widget + SUIT_Tools::centerWidget(this, parent); +} + + +//================================================================================= +// function : ~GEOMToolsGUI_LineWidthDlg() +// purpose : Destroys the object and frees any allocated resources +//================================================================================= +GEOMToolsGUI_LineWidthDlg::~GEOMToolsGUI_LineWidthDlg() +{ + // no need to delete child widgets, Qt does it all for us +} + +int GEOMToolsGUI_LineWidthDlg::getTheLW() const +{ + return mySpinBox->text().toInt(); +} + +void GEOMToolsGUI_LineWidthDlg::setTheLW (const int v) +{ + mySpinBox->setValue(v); +} + + +//================================================================================= +// function : ClickOnHelp() +// purpose : +//================================================================================= +void GEOMToolsGUI_LineWidthDlg::ClickOnHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) { + GeometryGUI* aGeomGUI = dynamic_cast(app->module("Geometry")); + app->onHelpContextModule(aGeomGUI ? app->moduleName(aGeomGUI->moduleName()) : QString(""), myHelpFileName); + } + else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif + SUIT_MessageBox::warning + (0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName), + QObject::tr("BUT_OK")); + } +} + +//================================================================================= +// function : keyPressEvent() +// purpose : +//================================================================================= +void GEOMToolsGUI_LineWidthDlg::keyPressEvent (QKeyEvent* e) +{ + QDialog::keyPressEvent(e); + if (e->isAccepted()) + return; + + if (e->key() == Qt::Key_F1) { + e->accept(); + ClickOnHelp(); + } +} diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h new file mode 100644 index 000000000..09bfe4446 --- /dev/null +++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h @@ -0,0 +1,59 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// 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 +// + +// GEOM GEOMGUI : GUI for Geometry component +// File : GEOMToolsGUI_DeflectionDlg.h +// Author : OCC Team +// +#ifndef GEOMTOOLSGUI_LINEWIDTHDLG_H +#define GEOMTOOLSGUI_LINEWIDTHDLG_H + +#include "GEOM_ToolsGUI.hxx" + +#include + +class SalomeApp_IntSpinBox; + +//================================================================================= +// class : GEOMToolsGUI_LineWidthDlg +// purpose : +//================================================================================= +class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_LineWidthDlg : public QDialog +{ + Q_OBJECT + +public: + GEOMToolsGUI_LineWidthDlg( QWidget*, const QString& ); + ~GEOMToolsGUI_LineWidthDlg(); + + int getTheLW() const; + void setTheLW( const int ); + +private slots: + void ClickOnHelp(); + +private: + void keyPressEvent( QKeyEvent* ); + +private: + SalomeApp_IntSpinBox* mySpinBox; + QString myHelpFileName; +}; + +#endif // GEOMTOOLSGUI_LINEWIDTHDLG_H diff --git a/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am index 63afb84f2..c3a32d6f4 100644 --- a/src/GEOMToolsGUI/Makefile.am +++ b/src/GEOMToolsGUI/Makefile.am @@ -36,7 +36,8 @@ salomeinclude_HEADERS = \ GEOMToolsGUI_DeleteDlg.h \ GEOMToolsGUI_MarkerDlg.h \ GEOMToolsGUI_PublishDlg.h \ - GEOMToolsGUI_MaterialPropertiesDlg.h + GEOMToolsGUI_MaterialPropertiesDlg.h \ + GEOMToolsGUI_LineWidthDlg.h dist_libGEOMToolsGUI_la_SOURCES = \ GEOMToolsGUI.cxx \ @@ -47,7 +48,8 @@ dist_libGEOMToolsGUI_la_SOURCES = \ GEOMToolsGUI_DeleteDlg.cxx \ GEOMToolsGUI_MarkerDlg.cxx \ GEOMToolsGUI_PublishDlg.cxx \ - GEOMToolsGUI_MaterialPropertiesDlg.cxx + GEOMToolsGUI_MaterialPropertiesDlg.cxx \ + GEOMToolsGUI_LineWidthDlg.cxx MOC_FILES = \ GEOMToolsGUI_TransparencyDlg_moc.cxx \ @@ -56,7 +58,8 @@ MOC_FILES = \ GEOMToolsGUI_DeleteDlg_moc.cxx \ GEOMToolsGUI_MarkerDlg_moc.cxx \ GEOMToolsGUI_PublishDlg_moc.cxx \ - GEOMToolsGUI_MaterialPropertiesDlg_moc.cxx + GEOMToolsGUI_MaterialPropertiesDlg_moc.cxx \ + GEOMToolsGUI_LineWidthDlg_moc.cxx nodist_libGEOMToolsGUI_la_SOURCES = \ $(MOC_FILES) diff --git a/src/MeasureGUI/MeasureGUI.h b/src/MeasureGUI/MeasureGUI.h index 4a9f28201..d196684f8 100644 --- a/src/MeasureGUI/MeasureGUI.h +++ b/src/MeasureGUI/MeasureGUI.h @@ -33,6 +33,12 @@ // class : MeasureGUI // purpose : //================================================================================= + +#define DISPLAY_PREVIEW_MACRO \ +SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); \ +int w = resMgr->integerValue("Geometry", "measures_line_width", 1); \ +displayPreview(true, false, true, true, w, -1, -1); + class MeasureGUI : public GEOMGUI { public: diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx index d80594e04..d628fa594 100644 --- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx @@ -377,6 +377,10 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs() anIO->SetArrowSize(arrowSize); } + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + int w = resMgr->integerValue("Geometry", "measures_line_width", 1); + anIO->SetWidth(w); + SOCC_Prs* aPrs = dynamic_cast(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx index c61cbc0af..2c8166beb 100644 --- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx @@ -24,6 +24,7 @@ // File : MeasureGUI_CheckCompoundOfBlocksDlg.cxx // Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com) // +#include "MeasureGUI.h" #include "MeasureGUI_CheckCompoundOfBlocksDlg.h" #include "MeasureGUI_Widgets.h" @@ -188,7 +189,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::SelectionIntoArgument() myObj = aSelectedObject; myGrp->LineEdit1->setText( GEOMBase::GetName( myObj ) ); processObject(); - displayPreview(true); + DISPLAY_PREVIEW_MACRO; } //================================================================================= @@ -228,7 +229,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::ActivateThisDialog() connect( aSel, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); activateSelection(); - displayPreview(true); + DISPLAY_PREVIEW_MACRO } //================================================================================= @@ -418,9 +419,11 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onSubShapesListSelectionChanged() QList::iterator it; for ( it = aIds.begin(); it != aIds.end(); ++it ) { aSubShape = anIndices.FindKey(aObjLst[(*it)]); + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + int w = resMgr->integerValue("Geometry", "measures_line_width", 1); try { getDisplayer()->SetColor( Quantity_NOC_RED ); - getDisplayer()->SetWidth( 3 ); + getDisplayer()->SetWidth( w ); getDisplayer()->SetToActivate( false ); aPrs = !aSubShape.IsNull() ? getDisplayer()->BuildPrs( aSubShape ) : 0; if ( aPrs ) diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx index ecd82d3e3..3b8bc2a13 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx @@ -327,6 +327,10 @@ SALOME_Prs* MeasureGUI_DistanceDlg::buildPrs() Handle(AIS_LengthDimension) anIO = new AIS_LengthDimension( aVert1, aVert2, P, aDist, TCollection_ExtendedString((Standard_CString)aLabel.toLatin1().constData())); anIO->SetArrowSize(aDist/20); + + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + int w = resMgr->integerValue("Geometry", "measures_line_width", 1); + anIO->SetWidth(w); SOCC_Prs* aPrs = dynamic_cast(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx index 44fc3639a..4b8ab9329 100644 --- a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx @@ -21,6 +21,7 @@ // File : MeasureGUI_NormaleDlg.cxx // Author : Julia DOROVSKIKH, Open CASCADE S.A.S. // +#include "MeasureGUI.h" #include "MeasureGUI_NormaleDlg.h" #include @@ -246,7 +247,7 @@ void MeasureGUI_NormaleDlg::SelectionIntoArgument() GroupArgs->PushButton1->click(); } - displayPreview(true); + DISPLAY_PREVIEW_MACRO } //================================================================================= @@ -286,7 +287,7 @@ void MeasureGUI_NormaleDlg::SetEditCurrentArgument() send->setDown(true); // seems we need it only to avoid preview disappearing, caused by selection mode change - displayPreview(true); + DISPLAY_PREVIEW_MACRO } //================================================================================= @@ -313,7 +314,7 @@ void MeasureGUI_NormaleDlg::ActivateThisDialog() connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); - displayPreview(true); + DISPLAY_PREVIEW_MACRO } //================================================================================= diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index 318ea45b8..9b956bf68 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -497,6 +497,12 @@ void GEOM_Actor::SetWireframeProperty(vtkProperty* Prop) myWireframeFaceActor->SetProperty(Prop); } + +vtkProperty* GEOM_Actor::GetWireframeProperty() +{ + return myWireframeFaceActor->GetProperty(); +} + void GEOM_Actor::SetShadingProperty(vtkProperty* Prop) { #ifdef MYDEBUG @@ -506,6 +512,12 @@ void GEOM_Actor::SetShadingProperty(vtkProperty* Prop) } +vtkProperty* GEOM_Actor::GetShadingProperty() +{ + return myShadingFaceProp; +} + + void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper) { #ifdef MYDEBUG @@ -995,6 +1007,27 @@ void GEOM_Actor::StoreIsoNumbers() myWireframeFaceSource->GetNbIso(myNbIsos[0], myNbIsos[1]); } +void GEOM_Actor::SetIsosWidth(const int width) { + myWireframeFaceActor->GetProperty()->SetLineWidth(width); +} + +int GEOM_Actor::GetIsosWidth() const { + return myWireframeFaceActor->GetProperty()->GetLineWidth(); +} + +void GEOM_Actor::SetWidth(const int width) { + myIsolatedEdgeActor->GetProperty()->SetLineWidth(width); + myOneFaceEdgeActor->GetProperty()->SetLineWidth(width); + mySharedEdgeActor->GetProperty()->SetLineWidth(width); + myHighlightProp->SetLineWidth(width); + myPreHighlightProp->SetLineWidth(width+1); + +} + +int GEOM_Actor::GetWidth() const { + return myIsolatedEdgeActor->GetProperty()->GetLineWidth(); +} + void GEOM_Actor::RestoreIsoNumbers() { if ( myNbIsos[0] > 0 || myNbIsos[1] > 0 ) diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h index a6e890d65..c0c31fc5a 100644 --- a/src/OBJECT/GEOM_Actor.h +++ b/src/OBJECT/GEOM_Actor.h @@ -86,6 +86,9 @@ public: void SetWireframeProperty(vtkProperty* Prop); void SetShadingProperty(vtkProperty* Prop); + vtkProperty* GetWireframeProperty(); + vtkProperty* GetShadingProperty(); + void setDeflection(double adef); virtual void setDisplayMode(int thenewmode); @@ -166,6 +169,15 @@ public: void GetNbIsos(int &theNbU,int &theNbV); + virtual + void SetIsosWidth(const int width); + + int GetIsosWidth() const; + + virtual void SetWidth(const int width); + + int GetWidth() const; + //! Vector mode management virtual void diff --git a/src/OBJECT/GEOM_Constants.h b/src/OBJECT/GEOM_Constants.h index 49bdabe8a..655dfc125 100644 --- a/src/OBJECT/GEOM_Constants.h +++ b/src/OBJECT/GEOM_Constants.h @@ -45,5 +45,7 @@ #define MARKER_TYPE_PROP "MarkerType" //Marker type property #define FRONT_MATERIAL_PROP "FrontMaterial" //Object front material property #define BACK_MATERIAL_PROP "BackMaterial" //Object back material property +#define EDGE_WIDTH_PROP "EdgeWidth" //Width of the edge +#define ISOS_WIDTH_PROP "IsosWidth" //Width of the iso-lines #endif //GEOM_CONSTANTS_H -- 2.39.2