From 26899105067f0159f62700a2b7ef66f0e4ec01fd Mon Sep 17 00:00:00 2001 From: dpasukhi Date: Thu, 26 Jan 2023 20:11:36 +0000 Subject: [PATCH] // commit Customise functions --- src/IGESControl/IGESControl_Controller.cxx | 386 ++++++++++----------- src/STEPControl/STEPControl_Controller.cxx | 278 +++++++-------- src/XSControl/XSControl_Controller.cxx | 196 +++++------ 3 files changed, 430 insertions(+), 430 deletions(-) diff --git a/src/IGESControl/IGESControl_Controller.cxx b/src/IGESControl/IGESControl_Controller.cxx index 9875e726db..ad579d0719 100644 --- a/src/IGESControl/IGESControl_Controller.cxx +++ b/src/IGESControl/IGESControl_Controller.cxx @@ -81,58 +81,58 @@ IGESControl_Controller::IGESControl_Controller (const Standard_Boolean mod) IGESAppli::Init(); init = Standard_True; } - AddSessionItem (new IGESSelect_RemoveCurves(Standard_True) ,"iges-remove-pcurves"); - AddSessionItem (new IGESSelect_RemoveCurves(Standard_False),"iges-remove-curves-3d"); - AddSessionItem (new IGESSelect_SetLabel (0,Standard_True) ,"iges-clear-label"); - AddSessionItem (new IGESSelect_SetLabel (1,Standard_False),"iges-set-label-dnum"); - - AddSessionItem (new IGESSelect_AutoCorrect,"iges-auto-correct",Standard_True); - AddSessionItem (new IGESSelect_ComputeStatus,"iges-compute-status",Standard_True); - - Handle(IGESSelect_FloatFormat) flf = new IGESSelect_FloatFormat; - flf->SetDefault (12); - AddSessionItem (flf,"iges-float-digits-12",Standard_True); - - // -- Sender Product Identification -- (pas un statique ...) - Handle(IGESSelect_SetGlobalParameter) set3 = new IGESSelect_SetGlobalParameter(3); - Handle(TCollection_HAsciiString) pa3 = Interface_Static::Static("write.iges.header.product")->HStringValue(); - set3->SetValue(pa3); - AddSessionItem (pa3, "iges-header-val-sender"); - AddSessionItem (set3,"iges-header-set-sender",Standard_True); - - AddSessionItem (new IGESSelect_UpdateFileName,"iges-update-file-name",Standard_True); - - // -- Receiver -- Acces par Static, ajustable - Handle(IGESSelect_SetGlobalParameter) set12 = new IGESSelect_SetGlobalParameter(12); - Handle(TCollection_HAsciiString) pa12 = Interface_Static::Static("write.iges.header.receiver")->HStringValue(); - set12->SetValue(pa12); - AddSessionItem (pa12, "iges-header-val-receiver"); - AddSessionItem (set12,"iges-header-set-receiver",Standard_True); - - // -- Auteur -- acces par Static (demarre par whoami), ajustable - Handle(IGESSelect_SetGlobalParameter) set21 = new IGESSelect_SetGlobalParameter(21); - Handle(TCollection_HAsciiString) pa21 = Interface_Static::Static("write.iges.header.author")->HStringValue(); - set21->SetValue(pa21); - AddSessionItem (pa21, "iges-header-val-author"); - AddSessionItem (set21,"iges-header-set-author",Standard_True); - - // -- Compagnie (de l auteur) -- acces par Static, ajustable - Handle(IGESSelect_SetGlobalParameter) set22 = new IGESSelect_SetGlobalParameter(22); - Handle(TCollection_HAsciiString) pa22 = Interface_Static::Static("write.iges.header.company")->HStringValue(); - set22->SetValue(pa22); - AddSessionItem (pa22, "iges-header-val-company"); - AddSessionItem (set22,"iges-header-set-company",Standard_True); - - // -- STATICS - - TraceStatic ("read.iges.bspline.approxd1.mode",5); - TraceStatic ("read.iges.bspline.continuity",5); - - TraceStatic ("write.iges.header.receiver",2); - TraceStatic ("write.iges.header.author",2); - TraceStatic ("write.iges.header.company",2); - TraceStatic ("write.iges.unit",6); - TraceStatic ("write.iges.brep.mode",6); + //AddSessionItem (new IGESSelect_RemoveCurves(Standard_True) ,"iges-remove-pcurves"); + //AddSessionItem (new IGESSelect_RemoveCurves(Standard_False),"iges-remove-curves-3d"); + //AddSessionItem (new IGESSelect_SetLabel (0,Standard_True) ,"iges-clear-label"); + //AddSessionItem (new IGESSelect_SetLabel (1,Standard_False),"iges-set-label-dnum"); + + //AddSessionItem (new IGESSelect_AutoCorrect,"iges-auto-correct",Standard_True); + //AddSessionItem (new IGESSelect_ComputeStatus,"iges-compute-status",Standard_True); + + //Handle(IGESSelect_FloatFormat) flf = new IGESSelect_FloatFormat; + //flf->SetDefault (12); + //AddSessionItem (flf,"iges-float-digits-12",Standard_True); + + //// -- Sender Product Identification -- (pas un statique ...) + //Handle(IGESSelect_SetGlobalParameter) set3 = new IGESSelect_SetGlobalParameter(3); + //Handle(TCollection_HAsciiString) pa3 = Interface_Static::Static("write.iges.header.product")->HStringValue(); + //set3->SetValue(pa3); + //AddSessionItem (pa3, "iges-header-val-sender"); + //AddSessionItem (set3,"iges-header-set-sender",Standard_True); + + //AddSessionItem (new IGESSelect_UpdateFileName,"iges-update-file-name",Standard_True); + + //// -- Receiver -- Acces par Static, ajustable + //Handle(IGESSelect_SetGlobalParameter) set12 = new IGESSelect_SetGlobalParameter(12); + //Handle(TCollection_HAsciiString) pa12 = Interface_Static::Static("write.iges.header.receiver")->HStringValue(); + //set12->SetValue(pa12); + //AddSessionItem (pa12, "iges-header-val-receiver"); + //AddSessionItem (set12,"iges-header-set-receiver",Standard_True); + + //// -- Auteur -- acces par Static (demarre par whoami), ajustable + //Handle(IGESSelect_SetGlobalParameter) set21 = new IGESSelect_SetGlobalParameter(21); + //Handle(TCollection_HAsciiString) pa21 = Interface_Static::Static("write.iges.header.author")->HStringValue(); + //set21->SetValue(pa21); + //AddSessionItem (pa21, "iges-header-val-author"); + //AddSessionItem (set21,"iges-header-set-author",Standard_True); + + //// -- Compagnie (de l auteur) -- acces par Static, ajustable + //Handle(IGESSelect_SetGlobalParameter) set22 = new IGESSelect_SetGlobalParameter(22); + //Handle(TCollection_HAsciiString) pa22 = Interface_Static::Static("write.iges.header.company")->HStringValue(); + //set22->SetValue(pa22); + //AddSessionItem (pa22, "iges-header-val-company"); + //AddSessionItem (set22,"iges-header-set-company",Standard_True); + + //// -- STATICS + + //TraceStatic ("read.iges.bspline.approxd1.mode",5); + //TraceStatic ("read.iges.bspline.continuity",5); + + //TraceStatic ("write.iges.header.receiver",2); + //TraceStatic ("write.iges.header.author",2); + //TraceStatic ("write.iges.header.company",2); + //TraceStatic ("write.iges.unit",6); + //TraceStatic ("write.iges.brep.mode",6); myAdaptorLibrary = new IGESSelect_WorkLibrary(themode); myAdaptorProtocol = IGESSelect_WorkLibrary::DefineProtocol(); @@ -143,153 +143,153 @@ IGESControl_Controller::IGESControl_Controller (const Standard_Boolean mod) myAdaptorWrite = new IGESControl_ActorWrite; - SetModeWrite (0,1); - SetModeWriteHelp (0,"Faces"); - SetModeWriteHelp (1,"BRep"); + //SetModeWrite (0,1); + //SetModeWriteHelp (0,"Faces"); + //SetModeWriteHelp (1,"BRep"); } void IGESControl_Controller::Customise(Handle(XSControl_WorkSession)& WS) { XSControl_Controller::Customise(WS); - // --- SELECTIONS, SIGNATURES, COMPTEURS, EDITEURS - // -- BypassGroup / xst-model-roots - - // Should be already set by the above call to Customise - Handle(IFSelect_SelectModelEntities) xma; - Handle(Standard_Transient) xma1 = WS->NamedItem("xst-model-all"); - if (xma1.IsNull()) xma = new IFSelect_SelectModelEntities; - else { - xma = Handle(IFSelect_SelectModelEntities)::DownCast(xma1); - WS->AddNamedItem ("xst-model-all",xma); - } - - Handle(IFSelect_SelectModelRoots) xmr; - Handle(Standard_Transient) xmr1 = WS->NamedItem("xst-model-roots"); - if (!xmr1.IsNull()) - xmr = Handle(IFSelect_SelectModelRoots)::DownCast(xmr1); - else { - xmr = new IFSelect_SelectModelRoots; - WS->AddNamedItem ("xst-model-roots",xmr); - } - - Handle(XSControl_SelectForTransfer) xtr; - Handle(Standard_Transient) xtr1 = WS->NamedItem("xst-transferrable-roots"); - if (!xtr1.IsNull()) - xtr = Handle(XSControl_SelectForTransfer)::DownCast(xtr1); - else { - xtr = new XSControl_SelectForTransfer; - xtr->SetReader (WS->TransferReader()); - WS->AddNamedItem ("xst-transferrable-roots",xtr); - } - - if (!xmr.IsNull()) { - Handle(IGESSelect_SelectVisibleStatus) visa = new IGESSelect_SelectVisibleStatus; - visa->SetInput(xmr); - WS->AddNamedItem ("iges-visible-roots",visa); - Handle(IGESSelect_SelectVisibleStatus) vist = new IGESSelect_SelectVisibleStatus; - vist->SetInput(xtr); - WS->AddNamedItem ("iges-visible-transf-roots",vist); - Handle(IGESSelect_SelectVisibleStatus) blka = new IGESSelect_SelectVisibleStatus; - blka->SetDirect (Standard_False); - blka->SetInput(xmr); - WS->AddNamedItem ("iges-blanked-roots",blka); - Handle(IGESSelect_SelectVisibleStatus) blkt = new IGESSelect_SelectVisibleStatus; - blkt->SetDirect (Standard_False); - blkt->SetInput(xtr); - WS->AddNamedItem ("iges-blanked-transf-roots",blkt); - Handle(IGESSelect_SelectSubordinate) indp = new IGESSelect_SelectSubordinate (0); - indp->SetInput (xma); - WS->AddNamedItem ("iges-status-independant",indp); - - Handle(IGESSelect_SelectBypassGroup) sb = new IGESSelect_SelectBypassGroup; - sb->SetInput(xmr); - WS->AddNamedItem ("iges-bypass-group",sb); - Handle(IGESSelect_SelectBypassSubfigure) sfi = new IGESSelect_SelectBypassSubfigure; - sfi->SetInput(xmr); - WS->AddNamedItem ("iges-bypass-subfigure",sfi); - Handle(IGESSelect_SelectBypassGroup) sfb = new IGESSelect_SelectBypassGroup; - sfb->SetInput(sfi); - WS->AddNamedItem ("iges-bypass-group-subfigure",sfb); - Handle(IGESSelect_SelectBasicGeom) sc3d = new IGESSelect_SelectBasicGeom(1); - sc3d->SetInput(sfi); - WS->AddNamedItem ("iges-curves-3d",sc3d); - Handle(IGESSelect_SelectBasicGeom) sb3d = new IGESSelect_SelectBasicGeom(2); - sb3d->SetInput(sfi); - WS->AddNamedItem ("iges-basic-curves-3d",sb3d); - Handle(IGESSelect_SelectBasicGeom) sbg = new IGESSelect_SelectBasicGeom(0); - sbg->SetInput(sfi); - WS->AddNamedItem ("iges-basic-geom",sbg); - Handle(IGESSelect_SelectBasicGeom) srf = new IGESSelect_SelectBasicGeom(-1); - srf->SetInput(sfi); - WS->AddNamedItem ("iges-surfaces",srf); - Handle(IGESSelect_SelectFaces) sfa = new IGESSelect_SelectFaces; - sfa->SetInput(sfi); - WS->AddNamedItem ("iges-faces",sfa ); - Handle(IGESSelect_SelectPCurves) spc = new IGESSelect_SelectPCurves(Standard_True); - spc->SetInput(sfa); - WS->AddNamedItem ("iges-pcurves",spc); - - Handle(IFSelect_SelectType) snosub = new IFSelect_SelectType - (STANDARD_TYPE(IGESBasic_SubfigureDef)); - snosub->SetDirect(Standard_False); - snosub->SetInput(xmr); - WS->AddNamedItem ("iges-no-indep-subfigure-def",snosub); - - Handle(IGESSelect_IGESTypeForm) itf = new IGESSelect_IGESTypeForm(Standard_True); - WS->AddNamedItem ("iges-type",itf); - - Handle(IGESSelect_SignStatus) sigst = new IGESSelect_SignStatus; - Handle(IFSelect_SignMultiple) typsta = new IFSelect_SignMultiple - ("IGES Type Form Status"); - typsta->Add (itf,15); - typsta->Add (sigst); - WS->AddNamedItem ("iges-type-status",typsta); - - Handle(IFSelect_SignMultiple) typnam = new IFSelect_SignMultiple - ("IGES Type Form TypeName"); - typnam->Add (itf,4); - typnam->Add (new IFSelect_SignType(Standard_True)); - WS->AddNamedItem ("iges-type-name",typnam); - - Handle(IFSelect_SignCounter) itfs = new IFSelect_SignCounter - (itf,Standard_False,Standard_True); - WS->AddNamedItem ("iges-types",itfs); - Handle(IGESSelect_CounterOfLevelNumber) levs = - new IGESSelect_CounterOfLevelNumber; - WS->AddNamedItem ("iges-levels",levs); - - Handle(IGESSelect_SignLevelNumber) slev = new IGESSelect_SignLevelNumber(Standard_False); - WS->AddNamedItem ("iges-level-number",slev); - Handle(IGESSelect_IGESName) igna = new IGESSelect_IGESName; - WS->AddNamedItem ("iges-name",igna); - - Handle(IGESSelect_SignColor) scol1 = new IGESSelect_SignColor (1); - WS->AddNamedItem ("iges-color-number",scol1); - Handle(IGESSelect_SignColor) scol2 = new IGESSelect_SignColor (2); - WS->AddNamedItem ("iges-color-name",scol2); - Handle(IGESSelect_SignColor) scol3 = new IGESSelect_SignColor (3); - WS->AddNamedItem ("iges-color-rgb",scol3); - Handle(IGESSelect_SignColor) scol4 = new IGESSelect_SignColor (4); - WS->AddNamedItem ("iges-color-red",scol4); - Handle(IGESSelect_SignColor) scol5 = new IGESSelect_SignColor (5); - WS->AddNamedItem ("iges-color-green",scol5); - Handle(IGESSelect_SignColor) scol6 = new IGESSelect_SignColor (6); - WS->AddNamedItem ("iges-color-blue",scol6); - - Handle(IGESSelect_EditHeader) edhead = new IGESSelect_EditHeader; - WS->AddNamedItem ("iges-header-edit",edhead); - Handle(IFSelect_EditForm) edheadf = edhead->Form(Standard_False); - WS->AddNamedItem ("iges-header",edheadf); - - Handle(IGESSelect_EditDirPart) eddirp = new IGESSelect_EditDirPart; - WS->AddNamedItem ("iges-dir-part-edit",eddirp); - Handle(IFSelect_EditForm) eddirpf = eddirp->Form(Standard_False); - WS->AddNamedItem ("iges-dir-part",eddirpf); - - //szv:mySignType = typnam; - WS->SetSignType( typnam ); - } + //// --- SELECTIONS, SIGNATURES, COMPTEURS, EDITEURS + //// -- BypassGroup / xst-model-roots + + //// Should be already set by the above call to Customise + //Handle(IFSelect_SelectModelEntities) xma; + //Handle(Standard_Transient) xma1 = WS->NamedItem("xst-model-all"); + //if (xma1.IsNull()) xma = new IFSelect_SelectModelEntities; + //else { + // xma = Handle(IFSelect_SelectModelEntities)::DownCast(xma1); + // WS->AddNamedItem ("xst-model-all",xma); + //} + // + //Handle(IFSelect_SelectModelRoots) xmr; + //Handle(Standard_Transient) xmr1 = WS->NamedItem("xst-model-roots"); + //if (!xmr1.IsNull()) + // xmr = Handle(IFSelect_SelectModelRoots)::DownCast(xmr1); + //else { + // xmr = new IFSelect_SelectModelRoots; + // WS->AddNamedItem ("xst-model-roots",xmr); + //} + + //Handle(XSControl_SelectForTransfer) xtr; + //Handle(Standard_Transient) xtr1 = WS->NamedItem("xst-transferrable-roots"); + //if (!xtr1.IsNull()) + // xtr = Handle(XSControl_SelectForTransfer)::DownCast(xtr1); + //else { + // xtr = new XSControl_SelectForTransfer; + // xtr->SetReader (WS->TransferReader()); + // WS->AddNamedItem ("xst-transferrable-roots",xtr); + //} + + //if (!xmr.IsNull()) { + // Handle(IGESSelect_SelectVisibleStatus) visa = new IGESSelect_SelectVisibleStatus; + // visa->SetInput(xmr); + // WS->AddNamedItem ("iges-visible-roots",visa); + // Handle(IGESSelect_SelectVisibleStatus) vist = new IGESSelect_SelectVisibleStatus; + // vist->SetInput(xtr); + // WS->AddNamedItem ("iges-visible-transf-roots",vist); + // Handle(IGESSelect_SelectVisibleStatus) blka = new IGESSelect_SelectVisibleStatus; + // blka->SetDirect (Standard_False); + // blka->SetInput(xmr); + // WS->AddNamedItem ("iges-blanked-roots",blka); + // Handle(IGESSelect_SelectVisibleStatus) blkt = new IGESSelect_SelectVisibleStatus; + // blkt->SetDirect (Standard_False); + // blkt->SetInput(xtr); + // WS->AddNamedItem ("iges-blanked-transf-roots",blkt); + // Handle(IGESSelect_SelectSubordinate) indp = new IGESSelect_SelectSubordinate (0); + // indp->SetInput (xma); + // WS->AddNamedItem ("iges-status-independant",indp); + + // Handle(IGESSelect_SelectBypassGroup) sb = new IGESSelect_SelectBypassGroup; + // sb->SetInput(xmr); + // WS->AddNamedItem ("iges-bypass-group",sb); + // Handle(IGESSelect_SelectBypassSubfigure) sfi = new IGESSelect_SelectBypassSubfigure; + // sfi->SetInput(xmr); + // WS->AddNamedItem ("iges-bypass-subfigure",sfi); + // Handle(IGESSelect_SelectBypassGroup) sfb = new IGESSelect_SelectBypassGroup; + // sfb->SetInput(sfi); + // WS->AddNamedItem ("iges-bypass-group-subfigure",sfb); + // Handle(IGESSelect_SelectBasicGeom) sc3d = new IGESSelect_SelectBasicGeom(1); + // sc3d->SetInput(sfi); + // WS->AddNamedItem ("iges-curves-3d",sc3d); + // Handle(IGESSelect_SelectBasicGeom) sb3d = new IGESSelect_SelectBasicGeom(2); + // sb3d->SetInput(sfi); + // WS->AddNamedItem ("iges-basic-curves-3d",sb3d); + // Handle(IGESSelect_SelectBasicGeom) sbg = new IGESSelect_SelectBasicGeom(0); + // sbg->SetInput(sfi); + // WS->AddNamedItem ("iges-basic-geom",sbg); + // Handle(IGESSelect_SelectBasicGeom) srf = new IGESSelect_SelectBasicGeom(-1); + // srf->SetInput(sfi); + // WS->AddNamedItem ("iges-surfaces",srf); + // Handle(IGESSelect_SelectFaces) sfa = new IGESSelect_SelectFaces; + // sfa->SetInput(sfi); + // WS->AddNamedItem ("iges-faces",sfa ); + // Handle(IGESSelect_SelectPCurves) spc = new IGESSelect_SelectPCurves(Standard_True); + // spc->SetInput(sfa); + // WS->AddNamedItem ("iges-pcurves",spc); + + // Handle(IFSelect_SelectType) snosub = new IFSelect_SelectType + // (STANDARD_TYPE(IGESBasic_SubfigureDef)); + // snosub->SetDirect(Standard_False); + // snosub->SetInput(xmr); + // WS->AddNamedItem ("iges-no-indep-subfigure-def",snosub); + + // Handle(IGESSelect_IGESTypeForm) itf = new IGESSelect_IGESTypeForm(Standard_True); + // WS->AddNamedItem ("iges-type",itf); + + // Handle(IGESSelect_SignStatus) sigst = new IGESSelect_SignStatus; + // Handle(IFSelect_SignMultiple) typsta = new IFSelect_SignMultiple + // ("IGES Type Form Status"); + // typsta->Add (itf,15); + // typsta->Add (sigst); + // WS->AddNamedItem ("iges-type-status",typsta); + + // Handle(IFSelect_SignMultiple) typnam = new IFSelect_SignMultiple + // ("IGES Type Form TypeName"); + // typnam->Add (itf,4); + // typnam->Add (new IFSelect_SignType(Standard_True)); + // WS->AddNamedItem ("iges-type-name",typnam); + + // Handle(IFSelect_SignCounter) itfs = new IFSelect_SignCounter + // (itf,Standard_False,Standard_True); + // WS->AddNamedItem ("iges-types",itfs); + // Handle(IGESSelect_CounterOfLevelNumber) levs = + // new IGESSelect_CounterOfLevelNumber; + // WS->AddNamedItem ("iges-levels",levs); + + // Handle(IGESSelect_SignLevelNumber) slev = new IGESSelect_SignLevelNumber(Standard_False); + // WS->AddNamedItem ("iges-level-number",slev); + // Handle(IGESSelect_IGESName) igna = new IGESSelect_IGESName; + // WS->AddNamedItem ("iges-name",igna); + + // Handle(IGESSelect_SignColor) scol1 = new IGESSelect_SignColor (1); + // WS->AddNamedItem ("iges-color-number",scol1); + // Handle(IGESSelect_SignColor) scol2 = new IGESSelect_SignColor (2); + // WS->AddNamedItem ("iges-color-name",scol2); + // Handle(IGESSelect_SignColor) scol3 = new IGESSelect_SignColor (3); + // WS->AddNamedItem ("iges-color-rgb",scol3); + // Handle(IGESSelect_SignColor) scol4 = new IGESSelect_SignColor (4); + // WS->AddNamedItem ("iges-color-red",scol4); + // Handle(IGESSelect_SignColor) scol5 = new IGESSelect_SignColor (5); + // WS->AddNamedItem ("iges-color-green",scol5); + // Handle(IGESSelect_SignColor) scol6 = new IGESSelect_SignColor (6); + // WS->AddNamedItem ("iges-color-blue",scol6); + + // Handle(IGESSelect_EditHeader) edhead = new IGESSelect_EditHeader; + // WS->AddNamedItem ("iges-header-edit",edhead); + // Handle(IFSelect_EditForm) edheadf = edhead->Form(Standard_False); + // WS->AddNamedItem ("iges-header",edheadf); + + // Handle(IGESSelect_EditDirPart) eddirp = new IGESSelect_EditDirPart; + // WS->AddNamedItem ("iges-dir-part-edit",eddirp); + // Handle(IFSelect_EditForm) eddirpf = eddirp->Form(Standard_False); + // WS->AddNamedItem ("iges-dir-part",eddirpf); + + // //szv:mySignType = typnam; + // WS->SetSignType( typnam ); + //} } diff --git a/src/STEPControl/STEPControl_Controller.cxx b/src/STEPControl/STEPControl_Controller.cxx index bdb17f8f88..703c634ef6 100644 --- a/src/STEPControl/STEPControl_Controller.cxx +++ b/src/STEPControl/STEPControl_Controller.cxx @@ -329,72 +329,72 @@ STEPControl_Controller::STEPControl_Controller () myAdaptorProtocol = STEPEdit::Protocol(); myAdaptorRead = new STEPControl_ActorRead; // par ex pour Recognize - SetModeWrite (0,4); - SetModeWriteHelp (0,"As Is"); - SetModeWriteHelp (1,"Faceted Brep"); - SetModeWriteHelp (2,"Shell Based"); - SetModeWriteHelp (3,"Manifold Solid"); - SetModeWriteHelp (4,"Wireframe"); - TraceStatic ("read.surfacecurve.mode",5); - - // --- SELECTIONS, SIGNATURES, COMPTEURS, EDITEURS - - DeclareAndCast(IFSelect_Selection,xmr,SessionItem("xst-model-roots")); - if (!xmr.IsNull()) { - Handle(IFSelect_Signature) sty = STEPEdit::SignType(); - AddSessionItem (sty,"step-type"); - Handle(IFSelect_SignCounter) tys = new IFSelect_SignCounter(sty,Standard_False,Standard_True); - AddSessionItem (tys,"step-types"); - - //szv:mySignType = sty; - - //pdn S4133 18.02.99 - AddSessionItem (new IFSelect_SignAncestor(),"xst-derived"); - - Handle(STEPSelections_SelectDerived) stdvar = new STEPSelections_SelectDerived(); - stdvar->SetProtocol(STEPEdit::Protocol()); - AddSessionItem (stdvar,"step-derived"); - - Handle(IFSelect_SelectSignature) selsdr = STEPEdit::NewSelectSDR(); - selsdr->SetInput (xmr); - AddSessionItem (selsdr,"step-shape-def-repr"); - - AddSessionItem (STEPEdit::NewSelectPlacedItem(),"step-placed-items"); - // input deja pret avec ModelAll - AddSessionItem (STEPEdit::NewSelectShapeRepr(),"step-shape-repr"); - } - - //pdn - Handle(STEPSelections_SelectFaces) stfaces = new STEPSelections_SelectFaces; - stfaces->SetInput (xmr); - AddSessionItem (stfaces,"step-faces"); - - Handle(STEPSelections_SelectInstances) stinst = new STEPSelections_SelectInstances; - AddSessionItem (stinst,"step-instances"); - - Handle(STEPSelections_SelectGSCurves) stcurves = new STEPSelections_SelectGSCurves; - stcurves->SetInput (xmr); - AddSessionItem (stcurves,"step-GS-curves"); - - Handle(STEPSelections_SelectAssembly) assembly = new STEPSelections_SelectAssembly; - assembly->SetInput (xmr); - AddSessionItem (assembly,"step-assembly"); - - Handle(APIHeaderSection_EditHeader) edhead = new APIHeaderSection_EditHeader; - Handle(IFSelect_EditForm) edheadf = new IFSelect_EditForm (edhead,Standard_False,Standard_True,"Step Header"); - AddSessionItem (edhead,"step-header-edit"); - AddSessionItem (edheadf,"step-header"); - - Handle(STEPEdit_EditContext) edctx = new STEPEdit_EditContext; - Handle(IFSelect_EditForm) edctxf = new IFSelect_EditForm (edctx,Standard_False,Standard_True,"STEP Product Definition Context"); - AddSessionItem (edctx,"step-context-edit"); - AddSessionItem (edctxf,"step-context"); - - - Handle(STEPEdit_EditSDR) edsdr = new STEPEdit_EditSDR; - Handle(IFSelect_EditForm) edsdrf = new IFSelect_EditForm (edsdr,Standard_False,Standard_True,"STEP Product Data (SDR)"); - AddSessionItem (edsdr,"step-SDR-edit"); - AddSessionItem (edsdrf,"step-SDR-data"); + //SetModeWrite (0,4); + //SetModeWriteHelp (0,"As Is"); + //SetModeWriteHelp (1,"Faceted Brep"); + //SetModeWriteHelp (2,"Shell Based"); + //SetModeWriteHelp (3,"Manifold Solid"); + //SetModeWriteHelp (4,"Wireframe"); + //TraceStatic ("read.surfacecurve.mode",5); + + //// --- SELECTIONS, SIGNATURES, COMPTEURS, EDITEURS + + //DeclareAndCast(IFSelect_Selection,xmr,SessionItem("xst-model-roots")); + //if (!xmr.IsNull()) { + // Handle(IFSelect_Signature) sty = STEPEdit::SignType(); + // AddSessionItem (sty,"step-type"); + // Handle(IFSelect_SignCounter) tys = new IFSelect_SignCounter(sty,Standard_False,Standard_True); + // AddSessionItem (tys,"step-types"); + + // //szv:mySignType = sty; + // + // //pdn S4133 18.02.99 + // AddSessionItem (new IFSelect_SignAncestor(),"xst-derived"); + + // Handle(STEPSelections_SelectDerived) stdvar = new STEPSelections_SelectDerived(); + // stdvar->SetProtocol(STEPEdit::Protocol()); + // AddSessionItem (stdvar,"step-derived"); + // + // Handle(IFSelect_SelectSignature) selsdr = STEPEdit::NewSelectSDR(); + // selsdr->SetInput (xmr); + // AddSessionItem (selsdr,"step-shape-def-repr"); + + // AddSessionItem (STEPEdit::NewSelectPlacedItem(),"step-placed-items"); + // // input deja pret avec ModelAll + // AddSessionItem (STEPEdit::NewSelectShapeRepr(),"step-shape-repr"); + //} + // + ////pdn + //Handle(STEPSelections_SelectFaces) stfaces = new STEPSelections_SelectFaces; + //stfaces->SetInput (xmr); + //AddSessionItem (stfaces,"step-faces"); + // + //Handle(STEPSelections_SelectInstances) stinst = new STEPSelections_SelectInstances; + //AddSessionItem (stinst,"step-instances"); + // + //Handle(STEPSelections_SelectGSCurves) stcurves = new STEPSelections_SelectGSCurves; + //stcurves->SetInput (xmr); + //AddSessionItem (stcurves,"step-GS-curves"); + // + //Handle(STEPSelections_SelectAssembly) assembly = new STEPSelections_SelectAssembly; + //assembly->SetInput (xmr); + //AddSessionItem (assembly,"step-assembly"); + // + //Handle(APIHeaderSection_EditHeader) edhead = new APIHeaderSection_EditHeader; + //Handle(IFSelect_EditForm) edheadf = new IFSelect_EditForm (edhead,Standard_False,Standard_True,"Step Header"); + //AddSessionItem (edhead,"step-header-edit"); + //AddSessionItem (edheadf,"step-header"); + + //Handle(STEPEdit_EditContext) edctx = new STEPEdit_EditContext; + //Handle(IFSelect_EditForm) edctxf = new IFSelect_EditForm (edctx,Standard_False,Standard_True,"STEP Product Definition Context"); + //AddSessionItem (edctx,"step-context-edit"); + //AddSessionItem (edctxf,"step-context"); + + + //Handle(STEPEdit_EditSDR) edsdr = new STEPEdit_EditSDR; + //Handle(IFSelect_EditForm) edsdrf = new IFSelect_EditForm (edsdr,Standard_False,Standard_True,"STEP Product Data (SDR)"); + //AddSessionItem (edsdr,"step-SDR-edit"); + //AddSessionItem (edsdrf,"step-SDR-data"); } Handle(Interface_InterfaceModel) STEPControl_Controller::NewModel () const @@ -441,77 +441,77 @@ void STEPControl_Controller::Customise(Handle(XSControl_WorkSession)& WS) { XSControl_Controller::Customise(WS); - Handle(IFSelect_SelectModelRoots) slr; - Handle(Standard_Transient) slr1 = WS->NamedItem("xst-model-roots"); - if(!slr1.IsNull()) - slr = Handle(IFSelect_SelectModelRoots)::DownCast(slr1); - else { - slr = new IFSelect_SelectModelRoots; - WS->AddNamedItem ("xst-model-roots",slr); - } - - Handle(STEPSelections_SelectForTransfer) st1= new STEPSelections_SelectForTransfer; - st1->SetReader (WS->TransferReader()); - WS->AddNamedItem ("xst-transferrable-roots",st1); - - if (!slr.IsNull()) { - Handle(IFSelect_Signature) sty = STEPEdit::SignType(); - WS->AddNamedItem ("step-type",sty); - - Handle(IFSelect_SignCounter) tys = new IFSelect_SignCounter(sty,Standard_False,Standard_True); - WS->AddNamedItem ("step-types",tys); - - //szv:mySignType = sty; - WS->SetSignType( sty ); - - //pdn S4133 18.02.99 - WS->AddNamedItem ("xst-derived",new IFSelect_SignAncestor()); - Handle(STEPSelections_SelectDerived) stdvar = new STEPSelections_SelectDerived(); - stdvar->SetProtocol(STEPEdit::Protocol()); - WS->AddNamedItem ("step-derived",stdvar); - - Handle(IFSelect_SelectSignature) selsdr = STEPEdit::NewSelectSDR(); - selsdr->SetInput (slr); - WS->AddNamedItem ("step-shape-def-repr",selsdr); - Handle(IFSelect_SelectSignature) selrrs = STEPEdit::NewSelectPlacedItem(); - WS->AddNamedItem ("step-placed-items",selrrs); - Handle(IFSelect_SelectSignature) selsr = STEPEdit::NewSelectShapeRepr(); - // input deja pret avec ModelAll - WS->AddNamedItem ("step-shape-repr",selsr); - } - - //pdn - Handle(STEPSelections_SelectFaces) stfaces = new STEPSelections_SelectFaces; - stfaces->SetInput (slr); - WS->AddNamedItem ("step-faces",stfaces); - - Handle(STEPSelections_SelectInstances) stinst = new STEPSelections_SelectInstances; - WS->AddNamedItem ("step-instances",stinst); - - Handle(STEPSelections_SelectGSCurves) stcurves = new STEPSelections_SelectGSCurves; - stcurves->SetInput (slr); - WS->AddNamedItem ("step-GS-curves",stcurves); - - Handle(STEPSelections_SelectAssembly) assembly = new STEPSelections_SelectAssembly; - assembly->SetInput (slr); - WS->AddNamedItem ("step-assembly",assembly); - - Handle(APIHeaderSection_EditHeader) edhead = new APIHeaderSection_EditHeader; - Handle(IFSelect_EditForm) edheadf = new IFSelect_EditForm (edhead,Standard_False,Standard_True,"Step Header"); - WS->AddNamedItem ("step-header-edit",edhead); - WS->AddNamedItem ("step-header",edheadf); - - Handle(STEPEdit_EditContext) edctx = new STEPEdit_EditContext; - Handle(IFSelect_EditForm) edctxf = new IFSelect_EditForm (edctx,Standard_False,Standard_True,"STEP Product Definition Context"); - WS->AddNamedItem ("step-context-edit",edctx); - WS->AddNamedItem ("step-context",edctxf); - - - Handle(STEPEdit_EditSDR) edsdr = new STEPEdit_EditSDR; - Handle(IFSelect_EditForm) edsdrf = new IFSelect_EditForm (edsdr,Standard_False,Standard_True,"STEP Product Data (SDR)"); - WS->AddNamedItem ("step-SDR-edit",edsdr); - WS->AddNamedItem ("step-SDR-data",edsdrf); - - - + // Handle(IFSelect_SelectModelRoots) slr; + // Handle(Standard_Transient) slr1 = WS->NamedItem("xst-model-roots"); + // if(!slr1.IsNull()) + // slr = Handle(IFSelect_SelectModelRoots)::DownCast(slr1); + // else { + // slr = new IFSelect_SelectModelRoots; + // WS->AddNamedItem ("xst-model-roots",slr); + // } + + // Handle(STEPSelections_SelectForTransfer) st1= new STEPSelections_SelectForTransfer; + // st1->SetReader (WS->TransferReader()); + // WS->AddNamedItem ("xst-transferrable-roots",st1); + + // if (!slr.IsNull()) { + // Handle(IFSelect_Signature) sty = STEPEdit::SignType(); + // WS->AddNamedItem ("step-type",sty); + // + // Handle(IFSelect_SignCounter) tys = new IFSelect_SignCounter(sty,Standard_False,Standard_True); + // WS->AddNamedItem ("step-types",tys); + + ////szv:mySignType = sty; + // WS->SetSignType( sty ); + // + // //pdn S4133 18.02.99 + // WS->AddNamedItem ("xst-derived",new IFSelect_SignAncestor()); + // Handle(STEPSelections_SelectDerived) stdvar = new STEPSelections_SelectDerived(); + // stdvar->SetProtocol(STEPEdit::Protocol()); + // WS->AddNamedItem ("step-derived",stdvar); + // + // Handle(IFSelect_SelectSignature) selsdr = STEPEdit::NewSelectSDR(); + // selsdr->SetInput (slr); + // WS->AddNamedItem ("step-shape-def-repr",selsdr); + // Handle(IFSelect_SelectSignature) selrrs = STEPEdit::NewSelectPlacedItem(); + // WS->AddNamedItem ("step-placed-items",selrrs); + // Handle(IFSelect_SelectSignature) selsr = STEPEdit::NewSelectShapeRepr(); + // // input deja pret avec ModelAll + // WS->AddNamedItem ("step-shape-repr",selsr); + // } + // + // //pdn + // Handle(STEPSelections_SelectFaces) stfaces = new STEPSelections_SelectFaces; + // stfaces->SetInput (slr); + // WS->AddNamedItem ("step-faces",stfaces); + // + // Handle(STEPSelections_SelectInstances) stinst = new STEPSelections_SelectInstances; + // WS->AddNamedItem ("step-instances",stinst); + // + // Handle(STEPSelections_SelectGSCurves) stcurves = new STEPSelections_SelectGSCurves; + // stcurves->SetInput (slr); + // WS->AddNamedItem ("step-GS-curves",stcurves); + // + // Handle(STEPSelections_SelectAssembly) assembly = new STEPSelections_SelectAssembly; + // assembly->SetInput (slr); + // WS->AddNamedItem ("step-assembly",assembly); + // + // Handle(APIHeaderSection_EditHeader) edhead = new APIHeaderSection_EditHeader; + // Handle(IFSelect_EditForm) edheadf = new IFSelect_EditForm (edhead,Standard_False,Standard_True,"Step Header"); + // WS->AddNamedItem ("step-header-edit",edhead); + // WS->AddNamedItem ("step-header",edheadf); + + // Handle(STEPEdit_EditContext) edctx = new STEPEdit_EditContext; + // Handle(IFSelect_EditForm) edctxf = new IFSelect_EditForm (edctx,Standard_False,Standard_True,"STEP Product Definition Context"); + // WS->AddNamedItem ("step-context-edit",edctx); + // WS->AddNamedItem ("step-context",edctxf); + + + // Handle(STEPEdit_EditSDR) edsdr = new STEPEdit_EditSDR; + // Handle(IFSelect_EditForm) edsdrf = new IFSelect_EditForm (edsdr,Standard_False,Standard_True,"STEP Product Data (SDR)"); + // WS->AddNamedItem ("step-SDR-edit",edsdr); + // WS->AddNamedItem ("step-SDR-data",edsdrf); + + // + // } diff --git a/src/XSControl/XSControl_Controller.cxx b/src/XSControl/XSControl_Controller.cxx index 3fd69c2d1f..f1e994cad1 100644 --- a/src/XSControl/XSControl_Controller.cxx +++ b/src/XSControl/XSControl_Controller.cxx @@ -376,102 +376,102 @@ Handle(Standard_Transient) XSControl_Controller::SessionItem (const Standard_CS void XSControl_Controller::Customise (Handle(XSControl_WorkSession)& WS) { - WS->SetParams (myParams,myParamUses); - - // General - if (!myAdaptorSession.IsEmpty()) { - NCollection_DataMap::Iterator iter(myAdaptorSession); - for (; iter.More(); iter.Next()) - WS->AddNamedItem (iter.Key().ToCString(), iter.ChangeValue()); - } - - if (WS->NamedItem("xst-model-all").IsNull()) { - - Handle(IFSelect_SelectModelEntities) sle = new IFSelect_SelectModelEntities; - WS->AddNamedItem ("xst-model-all",sle); - - Handle(IFSelect_SelectModelRoots) slr = new IFSelect_SelectModelRoots; - WS->AddNamedItem ("xst-model-roots",slr); - - if(strcasecmp(WS->SelectedNorm(),"STEP")) { - Handle(XSControl_SelectForTransfer) st1 = new XSControl_SelectForTransfer; - st1->SetInput (slr); - st1->SetReader (WS->TransferReader()); - WS->AddNamedItem ("xst-transferrable-roots",st1); - } - - Handle(XSControl_SelectForTransfer) st2 = new XSControl_SelectForTransfer; - st2->SetInput (sle); - st2->SetReader (WS->TransferReader()); - WS->AddNamedItem ("xst-transferrable-all",st2); - - Handle(XSControl_SignTransferStatus) strs = new XSControl_SignTransferStatus; - strs->SetReader (WS->TransferReader()); - WS->AddNamedItem ("xst-transfer-status",strs); - - Handle(XSControl_ConnectedShapes) scs = new XSControl_ConnectedShapes; - scs->SetReader (WS->TransferReader()); - WS->AddNamedItem ("xst-connected-faces",scs); - - Handle(IFSelect_SignType) stp = new IFSelect_SignType (Standard_False); - WS->AddNamedItem ("xst-long-type",stp); - - Handle(IFSelect_SignType) stc = new IFSelect_SignType (Standard_True); - WS->AddNamedItem ("xst-type",stc); - - WS->AddNamedItem ("xst-ancestor-type",new IFSelect_SignAncestor); - WS->AddNamedItem ("xst-types",new IFSelect_SignCounter(stp,Standard_False,Standard_True)); - WS->AddNamedItem ("xst-category",new IFSelect_SignCategory); - WS->AddNamedItem ("xst-validity",new IFSelect_SignValidity); - - Handle(IFSelect_DispPerOne) dispone = new IFSelect_DispPerOne; - dispone->SetFinalSelection(slr); - WS->AddNamedItem ("xst-disp-one",dispone); - - Handle(IFSelect_DispPerCount) dispcount = new IFSelect_DispPerCount; - Handle(IFSelect_IntParam) intcount = new IFSelect_IntParam; - intcount->SetValue(5); - dispcount->SetCount(intcount); - dispcount->SetFinalSelection(slr); - WS->AddNamedItem ("xst-disp-count",dispcount); - - Handle(IFSelect_DispPerFiles) dispfiles = new IFSelect_DispPerFiles; - Handle(IFSelect_IntParam) intfiles = new IFSelect_IntParam; - intfiles->SetValue(10); - dispfiles->SetCount(intfiles); - dispfiles->SetFinalSelection(slr); - WS->AddNamedItem ("xst-disp-files",dispfiles); - - Handle(IFSelect_DispPerSignature) dispsign = new IFSelect_DispPerSignature; - dispsign->SetSignCounter(new IFSelect_SignCounter(Handle(IFSelect_Signature)(stc))); - dispsign->SetFinalSelection(slr); - WS->AddNamedItem ("xst-disp-sign",dispsign); - - // Not used directly but useful anyway - WS->AddNamedItem ("xst-pointed",new IFSelect_SelectPointed); - WS->AddNamedItem ("xst-sharing",new IFSelect_SelectSharing); - WS->AddNamedItem ("xst-shared",new IFSelect_SelectShared); - WS->AddNamedItem ("xst-nb-selected",new IFSelect_GraphCounter); - - //szv:mySignType = stp; - WS->SetSignType( stp ); - } - - // Applied Modifiers - Standard_Integer i, nb = myAdaptorApplied.Length(); - for (i = 1; i <= nb; i ++) { - const Handle(Standard_Transient) &anitem = myAdaptorApplied.Value(i); - Handle(TCollection_HAsciiString) name = WS->Name(anitem); - WS->SetAppliedModifier(GetCasted(IFSelect_GeneralModifier,anitem),WS->ShareOut()); - } - - // Editors of Parameters - // Here for the specific manufacturers of controllers could create the - // Parameters: So wait here - - Handle(TColStd_HSequenceOfHAsciiString) listat = Interface_Static::Items(); - Handle(IFSelect_ParamEditor) paramed = IFSelect_ParamEditor::StaticEditor (listat,"All Static Parameters"); - WS->AddNamedItem ("xst-static-params-edit",paramed); - Handle(IFSelect_EditForm) paramform = paramed->Form(Standard_False); - WS->AddNamedItem ("xst-static-params",paramform); + //WS->SetParams (myParams,myParamUses); + + //// General + //if (!myAdaptorSession.IsEmpty()) { + // NCollection_DataMap::Iterator iter(myAdaptorSession); + // for (; iter.More(); iter.Next()) + // WS->AddNamedItem (iter.Key().ToCString(), iter.ChangeValue()); + //} + + //if (WS->NamedItem("xst-model-all").IsNull()) { + + // Handle(IFSelect_SelectModelEntities) sle = new IFSelect_SelectModelEntities; + // WS->AddNamedItem ("xst-model-all",sle); + + // Handle(IFSelect_SelectModelRoots) slr = new IFSelect_SelectModelRoots; + // WS->AddNamedItem ("xst-model-roots",slr); + + // if(strcasecmp(WS->SelectedNorm(),"STEP")) { + // Handle(XSControl_SelectForTransfer) st1 = new XSControl_SelectForTransfer; + // st1->SetInput (slr); + // st1->SetReader (WS->TransferReader()); + // WS->AddNamedItem ("xst-transferrable-roots",st1); + // } + + // Handle(XSControl_SelectForTransfer) st2 = new XSControl_SelectForTransfer; + // st2->SetInput (sle); + // st2->SetReader (WS->TransferReader()); + // WS->AddNamedItem ("xst-transferrable-all",st2); + // + // Handle(XSControl_SignTransferStatus) strs = new XSControl_SignTransferStatus; + // strs->SetReader (WS->TransferReader()); + // WS->AddNamedItem ("xst-transfer-status",strs); + // + // Handle(XSControl_ConnectedShapes) scs = new XSControl_ConnectedShapes; + // scs->SetReader (WS->TransferReader()); + // WS->AddNamedItem ("xst-connected-faces",scs); + + // Handle(IFSelect_SignType) stp = new IFSelect_SignType (Standard_False); + // WS->AddNamedItem ("xst-long-type",stp); + + // Handle(IFSelect_SignType) stc = new IFSelect_SignType (Standard_True); + // WS->AddNamedItem ("xst-type",stc); + + // WS->AddNamedItem ("xst-ancestor-type",new IFSelect_SignAncestor); + // WS->AddNamedItem ("xst-types",new IFSelect_SignCounter(stp,Standard_False,Standard_True)); + // WS->AddNamedItem ("xst-category",new IFSelect_SignCategory); + // WS->AddNamedItem ("xst-validity",new IFSelect_SignValidity); + + // Handle(IFSelect_DispPerOne) dispone = new IFSelect_DispPerOne; + // dispone->SetFinalSelection(slr); + // WS->AddNamedItem ("xst-disp-one",dispone); + + // Handle(IFSelect_DispPerCount) dispcount = new IFSelect_DispPerCount; + // Handle(IFSelect_IntParam) intcount = new IFSelect_IntParam; + // intcount->SetValue(5); + // dispcount->SetCount(intcount); + // dispcount->SetFinalSelection(slr); + // WS->AddNamedItem ("xst-disp-count",dispcount); + + // Handle(IFSelect_DispPerFiles) dispfiles = new IFSelect_DispPerFiles; + // Handle(IFSelect_IntParam) intfiles = new IFSelect_IntParam; + // intfiles->SetValue(10); + // dispfiles->SetCount(intfiles); + // dispfiles->SetFinalSelection(slr); + // WS->AddNamedItem ("xst-disp-files",dispfiles); + + // Handle(IFSelect_DispPerSignature) dispsign = new IFSelect_DispPerSignature; + // dispsign->SetSignCounter(new IFSelect_SignCounter(Handle(IFSelect_Signature)(stc))); + // dispsign->SetFinalSelection(slr); + // WS->AddNamedItem ("xst-disp-sign",dispsign); + + // // Not used directly but useful anyway + // WS->AddNamedItem ("xst-pointed",new IFSelect_SelectPointed); + // WS->AddNamedItem ("xst-sharing",new IFSelect_SelectSharing); + // WS->AddNamedItem ("xst-shared",new IFSelect_SelectShared); + // WS->AddNamedItem ("xst-nb-selected",new IFSelect_GraphCounter); + + // //szv:mySignType = stp; + // WS->SetSignType( stp ); + //} + + //// Applied Modifiers + //Standard_Integer i, nb = myAdaptorApplied.Length(); + //for (i = 1; i <= nb; i ++) { + // const Handle(Standard_Transient) &anitem = myAdaptorApplied.Value(i); + // Handle(TCollection_HAsciiString) name = WS->Name(anitem); + // WS->SetAppliedModifier(GetCasted(IFSelect_GeneralModifier,anitem),WS->ShareOut()); + //} + + //// Editors of Parameters + //// Here for the specific manufacturers of controllers could create the + //// Parameters: So wait here + + //Handle(TColStd_HSequenceOfHAsciiString) listat = Interface_Static::Items(); + //Handle(IFSelect_ParamEditor) paramed = IFSelect_ParamEditor::StaticEditor (listat,"All Static Parameters"); + //WS->AddNamedItem ("xst-static-params-edit",paramed); + //Handle(IFSelect_EditForm) paramform = paramed->Form(Standard_False); + //WS->AddNamedItem ("xst-static-params",paramform); } -- 2.39.5