From 0532c0c48648cc3c766d0b00c8ab252f7e6bc65d Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Thu, 8 Sep 2022 17:36:35 +0200 Subject: [PATCH] - cambio nome del progetto in Icarus - gestione ribs completata - nuove funzionalita' introdotte su tabella TFS - correzioni e migliorie varie --- .../MachiningManager/CurrMachiningPanelVM.vb | 89 ---- 3dPrintApp/TSFEditor/TFSEditorV.xaml | 117 ----- ExtLibs/EgtUILib.dll | Bin 477696 -> 477696 bytes 3dPrintApp/3dPrintApp.sln => Icarus.sln | 2 +- .../AboutBoxWindow/AboutBoxV.xaml | 0 .../AboutBoxWindow/AboutBoxV.xaml.vb | 0 {3dPrintApp => Icarus}/AirspacePopup.vb | 4 +- {3dPrintApp => Icarus}/App.config | 0 {3dPrintApp => Icarus}/Application.xaml | 0 {3dPrintApp => Icarus}/Application.xaml.vb | 0 .../ChooseReferenceWndV.xaml | 0 .../ChooseReferenceWndV.xaml.vb | 0 .../ChooseReferenceWndVM.vb | 0 .../Constants/Const3dPrint.vb | 5 + {3dPrintApp => Icarus}/Constants/ConstBeam.vb | 0 .../Constants/ConstColumns.vb | 0 .../Constants/ConstDataGridColumnsIni.vb | 0 {3dPrintApp => Icarus}/Constants/ConstDims.vb | 0 {3dPrintApp => Icarus}/Constants/ConstGen.vb | 6 +- {3dPrintApp => Icarus}/Constants/ConstIni.vb | 2 +- .../Constants/ConstMachComm.vb | 0 .../Constants/ConstMachIni.vb | 4 + {3dPrintApp => Icarus}/Constants/ConstMsg.vb | 0 .../ControllerInputPanelV.xaml | 0 .../ControllerInputPanelV.xaml.vb | 0 .../ControllerInputPanelVM.vb | 0 .../CurrLayerSlider/CurrLayerSliderV.xaml | 0 .../CurrLayerSlider/CurrLayerSliderV.xaml.vb | 0 .../CurrLayerSlider/CurrLayerSliderVM.vb | 0 .../IListItemConverter.vb | 0 .../MultiSelectorBehaviours.vb | 0 .../TwoListSynchronizer.vb | 0 .../DispositionPanel/DispositionPanelV.xaml | 2 +- .../DispositionPanelV.xaml.vb | 0 .../DispositionPanel/DispositionPanelVM.vb | 2 +- 3dPrintApp.sln => Icarus/Icarus.sln | 2 +- .../3dPrintApp.vbproj => Icarus/Icarus.vbproj | 31 +- .../ImportPanel/ImportPanelV.xaml | 2 +- .../ImportPanel/ImportPanelV.xaml.vb | 0 .../ImportPanel/ImportPanelVM.vb | 4 +- .../ImportPanel/ImportUtility.vb | 0 .../ImportWnd/ImportSceneHostV.xaml | 0 .../ImportWnd/ImportSceneHostV.xaml.vb | 0 .../ImportWnd/ImportSceneHostVM.vb | 0 .../ImportWnd/ImportWndV.xaml | 2 +- .../ImportWnd/ImportWndV.xaml.vb | 0 .../ImportWnd/ImportWndVM.vb | 0 .../InstrumentPanel/InstrumentPanelV.xaml | 0 .../InstrumentPanel/InstrumentPanelV.xaml.vb | 0 .../InstrumentPanel/MyInstrumentPanelVM.vb | 0 .../LeftPanel/LeftPanelV.xaml | 2 +- .../LeftPanel/LeftPanelV.xaml.vb | 0 .../LeftPanel/LeftPanelVM.vb | 0 .../MachSaveInDbWnd/MachSaveInDbWindowV.xaml | 50 ++ .../MachSaveInDbWindowV.xaml.vb | 18 + Icarus/MachSaveInDbWnd/MachSaveInDbWndVM.vb | 78 +++ .../MachinePanel/MachinePanelV.xaml | 0 .../MachinePanel/MachinePanelV.xaml.vb | 0 .../MachinePanel/MachinePanelVM.vb | 0 .../MachiningDb/MachiningDbV.xaml | 2 +- .../MachiningDb/MachiningDbV.xaml.vb | 0 .../MachiningDb/MachiningDbVM.vb | 52 +- .../MachiningManager/CurrMachining - Copy.vb | 0 .../MachiningManager/CurrMachining.vb | 7 +- .../CurrMachiningPanelV - Copy.xaml | 2 +- .../CurrMachiningPanelV - Copy.xaml.vb | 0 .../MachiningManager/CurrMachiningPanelV.xaml | 7 +- .../CurrMachiningPanelV.xaml.vb | 0 .../CurrMachiningPanelVM - Copy.vb | 0 .../MachiningManager/CurrMachiningPanelVM.vb | 142 +++++ .../MachiningManager/Machining - Copy.vb | 0 .../MachiningManager/Machining.vb | 4 + {3dPrintApp => Icarus}/MainWindow.xaml | 2 +- {3dPrintApp => Icarus}/MainWindow.xaml.vb | 0 .../MainWindow/MainWindowM.vb | 6 +- .../MainWindow/MainWindowV.xaml | 2 +- .../MainWindow/MainWindowV.xaml.vb | 0 .../MainWindow/MainWindowVM.vb | 42 +- {3dPrintApp => Icarus}/MaterialDb/Material.vb | 9 +- .../MaterialDb/MaterialDbV.xaml | 2 +- .../MaterialDb/MaterialDbV.xaml.vb | 0 .../MaterialDb/MaterialDbVM.vb | 2 +- .../My Project/AssemblyInfo.vb | 4 +- .../My Project/MyExtensions/MyWpfExtension.vb | 0 .../My Project/Resources.Designer.vb | 0 .../My Project/Resources.resx | 0 .../My Project/Settings.Designer.vb | 4 +- .../My Project/Settings.settings | 0 .../ProjManager/ProjManagerV.xaml | 0 .../ProjManager/ProjManagerV.xaml.vb | 0 .../ProjManager/ProjManagerVM.vb | 0 {3dPrintApp => Icarus}/Project/ProjectV.xaml | 43 +- .../Project/ProjectV.xaml.vb | 0 {3dPrintApp => Icarus}/Project/ProjectVM.vb | 0 .../Resources/AboutBoxImage.png | Bin .../Resources/CALCPanel/ChooseMachine.png | Bin .../Resources/CALCPanel/Edit.png | Bin .../Resources/CALCPanel/ResetCalc.png | Bin .../Resources/CALCPanel/Simulate.png | Bin .../Resources/CALCPanel/Verify.png | Bin .../Resources/CALCPanel/VerifyAll.png | Bin .../Configuration/MachiningsTable.png | Bin .../Resources/DrawPanel/AddPointCurve.png | Bin .../Resources/DrawPanel/ApproxCurve.png | Bin .../Resources/DrawPanel/Arc3P.png | Bin .../Resources/DrawPanel/ArcCSE.png | Bin .../Resources/DrawPanel/ArcFlip.png | Bin .../Resources/DrawPanel/ArcPDP.png | Bin .../Resources/DrawPanel/BreakCurve.png | Bin .../Resources/DrawPanel/Chamfer.png | Bin .../Resources/DrawPanel/ChangeColor.png | Bin .../Resources/DrawPanel/ChangeColorAlpha.png | Bin .../Resources/DrawPanel/ChangeLayer.png | Bin .../Resources/DrawPanel/ChangeStart.png | Bin .../Resources/DrawPanel/Circle3P.png | Bin .../Resources/DrawPanel/CircleCD.png | Bin .../Resources/DrawPanel/CircleCP.png | Bin .../Resources/DrawPanel/Delete.png | Bin .../Resources/DrawPanel/ExplodeCurve.png | Bin .../Resources/DrawPanel/ExplodeSurf.png | Bin .../Resources/DrawPanel/ExtendCurve.png | Bin .../Resources/DrawPanel/ExtractFacetLoops.png | Bin .../Resources/DrawPanel/ExtractLoops.png | Bin .../Resources/DrawPanel/ExtractSurfFacet.png | Bin .../Resources/DrawPanel/Extrude.png | Bin .../Resources/DrawPanel/Fillet.png | Bin .../Resources/DrawPanel/IntersectSurfSurf.png | Bin .../Resources/DrawPanel/InvertCurve.png | Bin .../Resources/DrawPanel/InvertSurf.png | Bin .../Resources/DrawPanel/JoinCurve.png | Bin .../Resources/DrawPanel/Line2P.png | Bin .../Resources/DrawPanel/LinePDL.png | Bin .../Resources/DrawPanel/LinearDimension.png | Bin .../Resources/DrawPanel/MergeSurf.png | Bin .../Resources/DrawPanel/Mirror.png | Bin .../Resources/DrawPanel/Mirror3D.png | Bin .../Resources/DrawPanel/ModifyCurve.png | Bin .../Resources/DrawPanel/ModifyText.png | Bin .../Resources/DrawPanel/Move.png | Bin .../Resources/DrawPanel/Offset.png | Bin .../Resources/DrawPanel/Plane.png | Bin .../Resources/DrawPanel/Point.png | Bin .../Resources/DrawPanel/Polygon.png | Bin .../Resources/DrawPanel/PolygonSide.png | Bin .../Resources/DrawPanel/Rectangle2P.png | Bin .../Resources/DrawPanel/RemoveColor.png | Bin .../Resources/DrawPanel/RemovePointCurve.png | Bin .../Resources/DrawPanel/Revolve.png | Bin .../Resources/DrawPanel/Rotate.png | Bin .../Resources/DrawPanel/Rotate3D.png | Bin .../Resources/DrawPanel/Ruled.png | Bin .../Resources/DrawPanel/Scale.png | Bin .../Resources/DrawPanel/Scale3D.png | Bin .../Resources/DrawPanel/Screw.png | Bin .../Resources/DrawPanel/SolidAddSurf.png | Bin .../DrawPanel/SolidIntersectSurf.png | Bin .../Resources/DrawPanel/SolidSubtractSurf.png | Bin .../Resources/DrawPanel/SplitCurve.png | Bin .../Resources/DrawPanel/Swept.png | Bin .../Resources/DrawPanel/Text.png | Bin .../Resources/DrawPanel/ThickCurve.png | Bin .../Resources/EgtBEAMWALL.ico | Bin .../Resources/Fonts/Roboto-Light.ttf | Bin .../Resources/Fonts/Roboto-Regular.ttf | Bin .../Resources/GridViewPanel/Analyze.png | Bin .../Resources/GridViewPanel/Cplane3POINTS.png | Bin .../Resources/GridViewPanel/CplaneBACK.png | Bin .../Resources/GridViewPanel/CplaneBOTTOM.png | Bin .../GridViewPanel/CplaneELEVATION.png | Bin .../Resources/GridViewPanel/CplaneFRONT.png | Bin .../Resources/GridViewPanel/CplaneLEFT.png | Bin .../Resources/GridViewPanel/CplaneOBJECT.png | Bin .../Resources/GridViewPanel/CplaneORIGIN.png | Bin .../GridViewPanel/CplanePERPCURVE.png | Bin .../Resources/GridViewPanel/CplaneRIGHT.png | Bin .../Resources/GridViewPanel/CplaneROTATE.png | Bin .../Resources/GridViewPanel/CplaneTOP.png | Bin .../Resources/GridViewPanel/CplaneView.png | Bin .../Resources/GridViewPanel/CurveDir.png | Bin .../Resources/GridViewPanel/GetDist.png | Bin .../Resources/GridViewPanel/LookFromBACK.png | Bin .../GridViewPanel/LookFromBOTTOM.png | Bin .../Resources/GridViewPanel/LookFromFRONT.png | Bin .../Resources/GridViewPanel/LookFromGrid.png | Bin .../GridViewPanel/LookFromISO_NE.png | Bin .../GridViewPanel/LookFromISO_NW.png | Bin .../GridViewPanel/LookFromISO_SE.png | Bin .../GridViewPanel/LookFromISO_SW.png | Bin .../Resources/GridViewPanel/LookFromLEFT.png | Bin .../Resources/GridViewPanel/LookFromRIGHT.png | Bin .../Resources/GridViewPanel/LookFromTOP.png | Bin .../Resources/GridViewPanel/LookToCplane.png | Bin .../Resources/GridViewPanel/RenderingHL.png | Bin .../Resources/GridViewPanel/RenderingSH.png | Bin .../Resources/GridViewPanel/RenderingWF.png | Bin .../Resources/GridViewPanel/ZoomAll.png | Bin .../Resources/GridViewPanel/ZoomIn.png | Bin .../Resources/GridViewPanel/ZoomOut.png | Bin .../Resources/GridViewPanel/ZoomSel.png | Bin .../Resources/InstrumentPanel/Analyze.png | Bin .../Resources/InstrumentPanel/ChangeParam.png | Bin .../Resources/InstrumentPanel/GetDist.png | Bin .../Resources/InstrumentPanel/Statistics.png | Bin .../Resources/LeftPanel/AddFeature.png | Bin .../Resources/LeftPanel/AddPart.png | Bin .../Resources/LeftPanel/AddToRawPart.png | Bin .../Resources/LeftPanel/CopyFeature.png | Bin .../Resources/LeftPanel/CopyPart.png | Bin .../Resources/LeftPanel/MacroFeature.png | Bin .../Resources/LeftPanel/NewRawPart.png | Bin .../Resources/LeftPanel/RemoveFeature.png | Bin .../Resources/LeftPanel/RemovePart.png | Bin .../Resources/MainMenu/Send.png | Bin .../MovePartInRawPart/MoveLeftParts.png | Bin .../MovePartInRawPart/MoveRightParts.png | Bin .../Resources/OptimizePanel/FlipRot.png | Bin .../Resources/OptimizePanel/UnlockFlip.png | Bin .../OptimizePanel/UnlockRotation.png | Bin .../Resources/OptimizePanel/Warehouse.png | Bin .../Resources/PartManager/LeftInvert.png | Bin .../Resources/PartManager/LeftRotate.png | Bin .../Resources/PartManager/Locked.old.png | Bin .../Resources/PartManager/Locked.png | Bin .../Resources/PartManager/RightInvert.png | Bin .../Resources/PartManager/RightRotate.png | Bin .../Resources/PartManager/Unlocked.old.png | Bin .../Resources/PartManager/Unlocked.png | Bin .../ProjectManager/ExportProject.png | Bin .../Resources/ProjectManager/GoToProd.png | Bin .../Resources/ProjectManager/GoToProj.png | Bin .../Resources/ProjectManager/Import.png | Bin .../Resources/ProjectManager/ImportBTL.png | Bin .../ProjectManager/ImportProject.png | Bin .../Resources/ProjectManager/New.png | Bin .../Resources/ProjectManager/Open.png | Bin .../Resources/ProjectManager/Options.png | Bin .../Resources/ProjectManager/Save.png | Bin .../Resources/ProjectManager/SaveAs.png | Bin .../Resources/ProjectManager/Send.png | Bin .../Resources/ProjectManager/UpdateBTL.png | Bin .../Resources/ShowBeamPanel/ShowAll.png | Bin .../Resources/ShowBeamPanel/ShowBuilding.png | Bin .../Resources/ShowBeamPanel/ShowSolid.png | Bin .../Resources/ShowPanel/CurveDir.png | Bin .../Resources/ShowPanel/RenderingHL.png | Bin .../Resources/ShowPanel/RenderingSH.png | Bin .../Resources/ShowPanel/RenderingWF.png | Bin .../Resources/Statistics/CopyToClipboard.png | Bin .../Resources/Statistics/PrintPDF.png | Bin .../Resources/TopPanel/CopyRawPart.png | Bin .../Resources/TopPanel/MoveDownPart.png | Bin .../Resources/TopPanel/MovePartInRawPart.png | Bin .../Resources/TopPanel/MoveUpPart.png | Bin .../Resources/TopPanel/ProduceAllRawPart.png | Bin .../Resources/TopPanel/ProduceRawPart.png | Bin .../Resources/TopPanel/RemovePart.old.png | Bin .../Resources/TopPanel/RemovePart.png | Bin .../Resources/TopPanel/RemoveRawPart.png | Bin .../Resources/TopPanel/ReorderPart.png | Bin .../Resources/TreeView/Folder.png | Bin .../Resources/ViewPanel/LookFromBACK.png | Bin .../Resources/ViewPanel/LookFromBOTTOM.png | Bin .../Resources/ViewPanel/LookFromFRONT.png | Bin .../Resources/ViewPanel/LookFromISO_NE.png | Bin .../Resources/ViewPanel/LookFromISO_NW.png | Bin .../Resources/ViewPanel/LookFromISO_SE.png | Bin .../Resources/ViewPanel/LookFromISO_SW.png | Bin .../Resources/ViewPanel/LookFromLEFT.png | Bin .../Resources/ViewPanel/LookFromRIGHT.png | Bin .../Resources/ViewPanel/LookFromTOP.png | Bin .../Resources/ViewPanel/ZoomAll.png | Bin .../Resources/ViewPanel/ZoomIn.png | Bin .../Resources/ViewPanel/ZoomOut.png | Bin .../RibPanel/RibPanelV.xaml | 14 +- .../RibPanel/RibPanelV.xaml.vb | 0 {3dPrintApp => Icarus}/RibPanel/RibPanelVM.vb | 486 ++++++++++++++---- Icarus/RibParamPanel/RibParamPanelV.xaml | 126 +++++ Icarus/RibParamPanel/RibParamPanelV.xaml.vb | 3 + Icarus/RibParamPanel/RibParamPanelVM.vb | 375 ++++++++++++++ .../RightPanel/RightPanelV.xaml | 11 +- .../RightPanel/RightPanelV.xaml.vb | 0 .../RightPanel/RightPanelVM.vb | 9 +- .../SceneHost/MySceneHostVM.vb | 92 +++- .../SceneHost/MySceneHostVM.vb.bak | 0 .../SceneHost/SceneHostV.xaml | 0 .../SceneHost/SceneHostV.xaml.vb | 0 .../SecondaryWindow/SecondaryWindowV.xaml | 2 +- .../SecondaryWindow/SecondaryWindowV.xaml.vb | 0 .../SecondaryWindow/SecondaryWindowVM.vb | 0 .../ShowPanel/ShowPanelV.xaml | 0 .../ShowPanel/ShowPanelV.xaml.vb | 0 .../SliceManager/SliceManagerV.xaml | 0 .../SliceManager/SliceManagerV.xaml.vb | 0 .../SliceManager/SliceManagerVM.vb | 1 + .../LayerAdvancementSliderV.xaml | 0 .../LayerAdvancementSliderV.xaml.vb | 0 .../SliderManager/LayerIndexSliderV.xaml | 0 .../SliderManager/LayerIndexSliderV.xaml.vb | 0 .../SliderManager/SliderManagerVM.vb | 6 +- .../Special-3dPrinting/Printing3DPanelV.xaml | 0 .../Printing3DPanelV.xaml.vb | 0 .../Special-3dPrinting/Printing3DPanelVM.vb | 0 .../Special-3dPrinting/Printing3DUtility.vb | 0 .../StartMachPanel/StartMachPanelV.xaml | 2 +- .../StartMachPanel/StartMachPanelV.xaml.vb | 0 .../StartMachPanel/StartMachPanelVM.vb | 0 .../StatusBar/MyStatusBarVM.vb | 0 .../StatusBar/StatusBarV.xaml | 0 .../StatusBar/StatusBarV.xaml.vb | 0 Icarus/TSFEditor/TFSEditorV.xaml | 172 +++++++ .../TSFEditor/TFSEditorV.xaml.vb | 0 .../TSFEditor/TFSEditorVM.vb | 206 +++++++- {3dPrintApp => Icarus}/Themes/Generic.xaml | 2 +- .../TopPanel/TopPanelV.xaml | 0 .../TopPanel/TopPanelV.xaml.vb | 0 {3dPrintApp => Icarus}/TopPanel/TopPanelVM.vb | 29 +- {3dPrintApp => Icarus}/Utility/BTLIniFile.vb | 0 {3dPrintApp => Icarus}/Utility/Converters.vb | 0 .../Utility/CurrentMachine.vb | 0 .../Utility/DbControllers.vb | 0 .../Utility/Dictionary.xaml | 12 +- .../Utility/Dictionary.xaml.vb | 0 .../Utility/DisableModifiedMgr.vb | 0 {3dPrintApp => Icarus}/Utility/LuaExec.vb | 5 +- .../Utility/MachParamIniFile.vb | 0 {3dPrintApp => Icarus}/Utility/Map.vb | 12 + {3dPrintApp => Icarus}/Utility/MyMachine.vb | 0 .../Utility/RawPartConfiguration.vb | 0 .../Utility/SectionXMaterialToBeAdded.vb | 0 .../Utility/TextBlockUtils.vb | 0 .../Utility/TreeViewItemBase.vb | 0 .../ViewModel/MaterialVM.vb | 0 .../ViewModel/Print3dLayerVM.vb | 0 .../ViewModel/Print3dPartVM.vb | 0 .../ViewPanel/ViewPanelV.xaml | 0 .../ViewPanel/ViewPanelV.xaml.vb | 0 .../ViewPanel/ViewPanelVM.vb | 0 {3dPrintApp => Icarus}/packages.config | 0 338 files changed, 1854 insertions(+), 465 deletions(-) delete mode 100644 3dPrintApp/MachiningManager/CurrMachiningPanelVM.vb delete mode 100644 3dPrintApp/TSFEditor/TFSEditorV.xaml rename 3dPrintApp/3dPrintApp.sln => Icarus.sln (87%) rename {3dPrintApp => Icarus}/AboutBoxWindow/AboutBoxV.xaml (100%) rename {3dPrintApp => Icarus}/AboutBoxWindow/AboutBoxV.xaml.vb (100%) rename {3dPrintApp => Icarus}/AirspacePopup.vb (98%) rename {3dPrintApp => Icarus}/App.config (100%) rename {3dPrintApp => Icarus}/Application.xaml (100%) rename {3dPrintApp => Icarus}/Application.xaml.vb (100%) rename {3dPrintApp => Icarus}/ChooseReferenceWnd/ChooseReferenceWndV.xaml (100%) rename {3dPrintApp => Icarus}/ChooseReferenceWnd/ChooseReferenceWndV.xaml.vb (100%) rename {3dPrintApp => Icarus}/ChooseReferenceWnd/ChooseReferenceWndVM.vb (100%) rename {3dPrintApp => Icarus}/Constants/Const3dPrint.vb (96%) rename {3dPrintApp => Icarus}/Constants/ConstBeam.vb (100%) rename {3dPrintApp => Icarus}/Constants/ConstColumns.vb (100%) rename {3dPrintApp => Icarus}/Constants/ConstDataGridColumnsIni.vb (100%) rename {3dPrintApp => Icarus}/Constants/ConstDims.vb (100%) rename {3dPrintApp => Icarus}/Constants/ConstGen.vb (93%) rename {3dPrintApp => Icarus}/Constants/ConstIni.vb (98%) rename {3dPrintApp => Icarus}/Constants/ConstMachComm.vb (100%) rename {3dPrintApp => Icarus}/Constants/ConstMachIni.vb (86%) rename {3dPrintApp => Icarus}/Constants/ConstMsg.vb (100%) rename {3dPrintApp => Icarus}/ControllerInputPanel/ControllerInputPanelV.xaml (100%) rename {3dPrintApp => Icarus}/ControllerInputPanel/ControllerInputPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/ControllerInputPanel/ControllerInputPanelVM.vb (100%) rename {3dPrintApp => Icarus}/CurrLayerSlider/CurrLayerSliderV.xaml (100%) rename {3dPrintApp => Icarus}/CurrLayerSlider/CurrLayerSliderV.xaml.vb (100%) rename {3dPrintApp => Icarus}/CurrLayerSlider/CurrLayerSliderVM.vb (100%) rename {3dPrintApp => Icarus}/DataGridMultiselectManaging/IListItemConverter.vb (100%) rename {3dPrintApp => Icarus}/DataGridMultiselectManaging/MultiSelectorBehaviours.vb (100%) rename {3dPrintApp => Icarus}/DataGridMultiselectManaging/TwoListSynchronizer.vb (100%) rename {3dPrintApp => Icarus}/DispositionPanel/DispositionPanelV.xaml (98%) rename {3dPrintApp => Icarus}/DispositionPanel/DispositionPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/DispositionPanel/DispositionPanelVM.vb (99%) rename 3dPrintApp.sln => Icarus/Icarus.sln (86%) rename 3dPrintApp/3dPrintApp.vbproj => Icarus/Icarus.vbproj (95%) rename {3dPrintApp => Icarus}/ImportPanel/ImportPanelV.xaml (98%) rename {3dPrintApp => Icarus}/ImportPanel/ImportPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/ImportPanel/ImportPanelVM.vb (98%) rename {3dPrintApp => Icarus}/ImportPanel/ImportUtility.vb (100%) rename {3dPrintApp => Icarus}/ImportWnd/ImportSceneHostV.xaml (100%) rename {3dPrintApp => Icarus}/ImportWnd/ImportSceneHostV.xaml.vb (100%) rename {3dPrintApp => Icarus}/ImportWnd/ImportSceneHostVM.vb (100%) rename {3dPrintApp => Icarus}/ImportWnd/ImportWndV.xaml (95%) rename {3dPrintApp => Icarus}/ImportWnd/ImportWndV.xaml.vb (100%) rename {3dPrintApp => Icarus}/ImportWnd/ImportWndVM.vb (100%) rename {3dPrintApp => Icarus}/InstrumentPanel/InstrumentPanelV.xaml (100%) rename {3dPrintApp => Icarus}/InstrumentPanel/InstrumentPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/InstrumentPanel/MyInstrumentPanelVM.vb (100%) rename {3dPrintApp => Icarus}/LeftPanel/LeftPanelV.xaml (96%) rename {3dPrintApp => Icarus}/LeftPanel/LeftPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/LeftPanel/LeftPanelVM.vb (100%) create mode 100644 Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml create mode 100644 Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml.vb create mode 100644 Icarus/MachSaveInDbWnd/MachSaveInDbWndVM.vb rename {3dPrintApp => Icarus}/MachinePanel/MachinePanelV.xaml (100%) rename {3dPrintApp => Icarus}/MachinePanel/MachinePanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/MachinePanel/MachinePanelVM.vb (100%) rename {3dPrintApp => Icarus}/MachiningDb/MachiningDbV.xaml (99%) rename {3dPrintApp => Icarus}/MachiningDb/MachiningDbV.xaml.vb (100%) rename {3dPrintApp => Icarus}/MachiningDb/MachiningDbVM.vb (81%) rename {3dPrintApp => Icarus}/MachiningManager/CurrMachining - Copy.vb (100%) rename {3dPrintApp => Icarus}/MachiningManager/CurrMachining.vb (99%) rename {3dPrintApp => Icarus}/MachiningManager/CurrMachiningPanelV - Copy.xaml (99%) rename {3dPrintApp => Icarus}/MachiningManager/CurrMachiningPanelV - Copy.xaml.vb (100%) rename {3dPrintApp => Icarus}/MachiningManager/CurrMachiningPanelV.xaml (96%) rename {3dPrintApp => Icarus}/MachiningManager/CurrMachiningPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/MachiningManager/CurrMachiningPanelVM - Copy.vb (100%) create mode 100644 Icarus/MachiningManager/CurrMachiningPanelVM.vb rename {3dPrintApp => Icarus}/MachiningManager/Machining - Copy.vb (100%) rename {3dPrintApp => Icarus}/MachiningManager/Machining.vb (99%) rename {3dPrintApp => Icarus}/MainWindow.xaml (90%) rename {3dPrintApp => Icarus}/MainWindow.xaml.vb (100%) rename {3dPrintApp => Icarus}/MainWindow/MainWindowM.vb (98%) rename {3dPrintApp => Icarus}/MainWindow/MainWindowV.xaml (95%) rename {3dPrintApp => Icarus}/MainWindow/MainWindowV.xaml.vb (100%) rename {3dPrintApp => Icarus}/MainWindow/MainWindowVM.vb (86%) rename {3dPrintApp => Icarus}/MaterialDb/Material.vb (98%) rename {3dPrintApp => Icarus}/MaterialDb/MaterialDbV.xaml (99%) rename {3dPrintApp => Icarus}/MaterialDb/MaterialDbV.xaml.vb (100%) rename {3dPrintApp => Icarus}/MaterialDb/MaterialDbVM.vb (99%) rename {3dPrintApp => Icarus}/My Project/AssemblyInfo.vb (96%) rename {3dPrintApp => Icarus}/My Project/MyExtensions/MyWpfExtension.vb (100%) rename {3dPrintApp => Icarus}/My Project/Resources.Designer.vb (100%) rename {3dPrintApp => Icarus}/My Project/Resources.resx (100%) rename {3dPrintApp => Icarus}/My Project/Settings.Designer.vb (95%) rename {3dPrintApp => Icarus}/My Project/Settings.settings (100%) rename {3dPrintApp => Icarus}/ProjManager/ProjManagerV.xaml (100%) rename {3dPrintApp => Icarus}/ProjManager/ProjManagerV.xaml.vb (100%) rename {3dPrintApp => Icarus}/ProjManager/ProjManagerVM.vb (100%) rename {3dPrintApp => Icarus}/Project/ProjectV.xaml (85%) rename {3dPrintApp => Icarus}/Project/ProjectV.xaml.vb (100%) rename {3dPrintApp => Icarus}/Project/ProjectVM.vb (100%) rename {3dPrintApp => Icarus}/Resources/AboutBoxImage.png (100%) rename {3dPrintApp => Icarus}/Resources/CALCPanel/ChooseMachine.png (100%) rename {3dPrintApp => Icarus}/Resources/CALCPanel/Edit.png (100%) rename {3dPrintApp => Icarus}/Resources/CALCPanel/ResetCalc.png (100%) rename {3dPrintApp => Icarus}/Resources/CALCPanel/Simulate.png (100%) rename {3dPrintApp => Icarus}/Resources/CALCPanel/Verify.png (100%) rename {3dPrintApp => Icarus}/Resources/CALCPanel/VerifyAll.png (100%) rename {3dPrintApp => Icarus}/Resources/Configuration/MachiningsTable.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/AddPointCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ApproxCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Arc3P.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ArcCSE.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ArcFlip.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ArcPDP.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/BreakCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Chamfer.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ChangeColor.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ChangeColorAlpha.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ChangeLayer.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ChangeStart.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Circle3P.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/CircleCD.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/CircleCP.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Delete.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ExplodeCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ExplodeSurf.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ExtendCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ExtractFacetLoops.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ExtractLoops.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ExtractSurfFacet.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Extrude.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Fillet.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/IntersectSurfSurf.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/InvertCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/InvertSurf.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/JoinCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Line2P.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/LinePDL.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/LinearDimension.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/MergeSurf.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Mirror.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Mirror3D.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ModifyCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ModifyText.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Move.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Offset.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Plane.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Point.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Polygon.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/PolygonSide.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Rectangle2P.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/RemoveColor.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/RemovePointCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Revolve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Rotate.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Rotate3D.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Ruled.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Scale.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Scale3D.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Screw.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/SolidAddSurf.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/SolidIntersectSurf.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/SolidSubtractSurf.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/SplitCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Swept.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/Text.png (100%) rename {3dPrintApp => Icarus}/Resources/DrawPanel/ThickCurve.png (100%) rename {3dPrintApp => Icarus}/Resources/EgtBEAMWALL.ico (100%) rename {3dPrintApp => Icarus}/Resources/Fonts/Roboto-Light.ttf (100%) rename {3dPrintApp => Icarus}/Resources/Fonts/Roboto-Regular.ttf (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/Analyze.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/Cplane3POINTS.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneBACK.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneBOTTOM.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneELEVATION.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneFRONT.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneLEFT.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneOBJECT.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneORIGIN.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplanePERPCURVE.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneRIGHT.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneROTATE.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneTOP.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CplaneView.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/CurveDir.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/GetDist.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromBACK.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromBOTTOM.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromFRONT.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromGrid.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromISO_NE.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromISO_NW.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromISO_SE.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromISO_SW.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromLEFT.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromRIGHT.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookFromTOP.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/LookToCplane.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/RenderingHL.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/RenderingSH.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/RenderingWF.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/ZoomAll.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/ZoomIn.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/ZoomOut.png (100%) rename {3dPrintApp => Icarus}/Resources/GridViewPanel/ZoomSel.png (100%) rename {3dPrintApp => Icarus}/Resources/InstrumentPanel/Analyze.png (100%) rename {3dPrintApp => Icarus}/Resources/InstrumentPanel/ChangeParam.png (100%) rename {3dPrintApp => Icarus}/Resources/InstrumentPanel/GetDist.png (100%) rename {3dPrintApp => Icarus}/Resources/InstrumentPanel/Statistics.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/AddFeature.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/AddPart.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/AddToRawPart.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/CopyFeature.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/CopyPart.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/MacroFeature.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/NewRawPart.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/RemoveFeature.png (100%) rename {3dPrintApp => Icarus}/Resources/LeftPanel/RemovePart.png (100%) rename {3dPrintApp => Icarus}/Resources/MainMenu/Send.png (100%) rename {3dPrintApp => Icarus}/Resources/MovePartInRawPart/MoveLeftParts.png (100%) rename {3dPrintApp => Icarus}/Resources/MovePartInRawPart/MoveRightParts.png (100%) rename {3dPrintApp => Icarus}/Resources/OptimizePanel/FlipRot.png (100%) rename {3dPrintApp => Icarus}/Resources/OptimizePanel/UnlockFlip.png (100%) rename {3dPrintApp => Icarus}/Resources/OptimizePanel/UnlockRotation.png (100%) rename {3dPrintApp => Icarus}/Resources/OptimizePanel/Warehouse.png (100%) rename {3dPrintApp => Icarus}/Resources/PartManager/LeftInvert.png (100%) rename {3dPrintApp => Icarus}/Resources/PartManager/LeftRotate.png (100%) rename {3dPrintApp => Icarus}/Resources/PartManager/Locked.old.png (100%) rename {3dPrintApp => Icarus}/Resources/PartManager/Locked.png (100%) rename {3dPrintApp => Icarus}/Resources/PartManager/RightInvert.png (100%) rename {3dPrintApp => Icarus}/Resources/PartManager/RightRotate.png (100%) rename {3dPrintApp => Icarus}/Resources/PartManager/Unlocked.old.png (100%) rename {3dPrintApp => Icarus}/Resources/PartManager/Unlocked.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/ExportProject.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/GoToProd.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/GoToProj.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/Import.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/ImportBTL.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/ImportProject.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/New.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/Open.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/Options.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/Save.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/SaveAs.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/Send.png (100%) rename {3dPrintApp => Icarus}/Resources/ProjectManager/UpdateBTL.png (100%) rename {3dPrintApp => Icarus}/Resources/ShowBeamPanel/ShowAll.png (100%) rename {3dPrintApp => Icarus}/Resources/ShowBeamPanel/ShowBuilding.png (100%) rename {3dPrintApp => Icarus}/Resources/ShowBeamPanel/ShowSolid.png (100%) rename {3dPrintApp => Icarus}/Resources/ShowPanel/CurveDir.png (100%) rename {3dPrintApp => Icarus}/Resources/ShowPanel/RenderingHL.png (100%) rename {3dPrintApp => Icarus}/Resources/ShowPanel/RenderingSH.png (100%) rename {3dPrintApp => Icarus}/Resources/ShowPanel/RenderingWF.png (100%) rename {3dPrintApp => Icarus}/Resources/Statistics/CopyToClipboard.png (100%) rename {3dPrintApp => Icarus}/Resources/Statistics/PrintPDF.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/CopyRawPart.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/MoveDownPart.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/MovePartInRawPart.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/MoveUpPart.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/ProduceAllRawPart.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/ProduceRawPart.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/RemovePart.old.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/RemovePart.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/RemoveRawPart.png (100%) rename {3dPrintApp => Icarus}/Resources/TopPanel/ReorderPart.png (100%) rename {3dPrintApp => Icarus}/Resources/TreeView/Folder.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromBACK.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromBOTTOM.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromFRONT.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromISO_NE.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromISO_NW.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromISO_SE.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromISO_SW.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromLEFT.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromRIGHT.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/LookFromTOP.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/ZoomAll.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/ZoomIn.png (100%) rename {3dPrintApp => Icarus}/Resources/ViewPanel/ZoomOut.png (100%) rename {3dPrintApp => Icarus}/RibPanel/RibPanelV.xaml (97%) rename {3dPrintApp => Icarus}/RibPanel/RibPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/RibPanel/RibPanelVM.vb (65%) create mode 100644 Icarus/RibParamPanel/RibParamPanelV.xaml create mode 100644 Icarus/RibParamPanel/RibParamPanelV.xaml.vb create mode 100644 Icarus/RibParamPanel/RibParamPanelVM.vb rename {3dPrintApp => Icarus}/RightPanel/RightPanelV.xaml (78%) rename {3dPrintApp => Icarus}/RightPanel/RightPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/RightPanel/RightPanelVM.vb (82%) rename {3dPrintApp => Icarus}/SceneHost/MySceneHostVM.vb (91%) rename {3dPrintApp => Icarus}/SceneHost/MySceneHostVM.vb.bak (100%) rename {3dPrintApp => Icarus}/SceneHost/SceneHostV.xaml (100%) rename {3dPrintApp => Icarus}/SceneHost/SceneHostV.xaml.vb (100%) rename {3dPrintApp => Icarus}/SecondaryWindow/SecondaryWindowV.xaml (95%) rename {3dPrintApp => Icarus}/SecondaryWindow/SecondaryWindowV.xaml.vb (100%) rename {3dPrintApp => Icarus}/SecondaryWindow/SecondaryWindowVM.vb (100%) rename {3dPrintApp => Icarus}/ShowPanel/ShowPanelV.xaml (100%) rename {3dPrintApp => Icarus}/ShowPanel/ShowPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/SliceManager/SliceManagerV.xaml (100%) rename {3dPrintApp => Icarus}/SliceManager/SliceManagerV.xaml.vb (100%) rename {3dPrintApp => Icarus}/SliceManager/SliceManagerVM.vb (99%) rename {3dPrintApp => Icarus}/SliderManager/LayerAdvancementSliderV.xaml (100%) rename {3dPrintApp => Icarus}/SliderManager/LayerAdvancementSliderV.xaml.vb (100%) rename {3dPrintApp => Icarus}/SliderManager/LayerIndexSliderV.xaml (100%) rename {3dPrintApp => Icarus}/SliderManager/LayerIndexSliderV.xaml.vb (100%) rename {3dPrintApp => Icarus}/SliderManager/SliderManagerVM.vb (96%) rename {3dPrintApp => Icarus}/Special-3dPrinting/Printing3DPanelV.xaml (100%) rename {3dPrintApp => Icarus}/Special-3dPrinting/Printing3DPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/Special-3dPrinting/Printing3DPanelVM.vb (100%) rename {3dPrintApp => Icarus}/Special-3dPrinting/Printing3DUtility.vb (100%) rename {3dPrintApp => Icarus}/StartMachPanel/StartMachPanelV.xaml (99%) rename {3dPrintApp => Icarus}/StartMachPanel/StartMachPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/StartMachPanel/StartMachPanelVM.vb (100%) rename {3dPrintApp => Icarus}/StatusBar/MyStatusBarVM.vb (100%) rename {3dPrintApp => Icarus}/StatusBar/StatusBarV.xaml (100%) rename {3dPrintApp => Icarus}/StatusBar/StatusBarV.xaml.vb (100%) create mode 100644 Icarus/TSFEditor/TFSEditorV.xaml rename {3dPrintApp => Icarus}/TSFEditor/TFSEditorV.xaml.vb (100%) rename {3dPrintApp => Icarus}/TSFEditor/TFSEditorVM.vb (73%) rename {3dPrintApp => Icarus}/Themes/Generic.xaml (94%) rename {3dPrintApp => Icarus}/TopPanel/TopPanelV.xaml (100%) rename {3dPrintApp => Icarus}/TopPanel/TopPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/TopPanel/TopPanelVM.vb (95%) rename {3dPrintApp => Icarus}/Utility/BTLIniFile.vb (100%) rename {3dPrintApp => Icarus}/Utility/Converters.vb (100%) rename {3dPrintApp => Icarus}/Utility/CurrentMachine.vb (100%) rename {3dPrintApp => Icarus}/Utility/DbControllers.vb (100%) rename {3dPrintApp => Icarus}/Utility/Dictionary.xaml (99%) rename {3dPrintApp => Icarus}/Utility/Dictionary.xaml.vb (100%) rename {3dPrintApp => Icarus}/Utility/DisableModifiedMgr.vb (100%) rename {3dPrintApp => Icarus}/Utility/LuaExec.vb (97%) rename {3dPrintApp => Icarus}/Utility/MachParamIniFile.vb (100%) rename {3dPrintApp => Icarus}/Utility/Map.vb (98%) rename {3dPrintApp => Icarus}/Utility/MyMachine.vb (100%) rename {3dPrintApp => Icarus}/Utility/RawPartConfiguration.vb (100%) rename {3dPrintApp => Icarus}/Utility/SectionXMaterialToBeAdded.vb (100%) rename {3dPrintApp => Icarus}/Utility/TextBlockUtils.vb (100%) rename {3dPrintApp => Icarus}/Utility/TreeViewItemBase.vb (100%) rename {3dPrintApp => Icarus}/ViewModel/MaterialVM.vb (100%) rename {3dPrintApp => Icarus}/ViewModel/Print3dLayerVM.vb (100%) rename {3dPrintApp => Icarus}/ViewModel/Print3dPartVM.vb (100%) rename {3dPrintApp => Icarus}/ViewPanel/ViewPanelV.xaml (100%) rename {3dPrintApp => Icarus}/ViewPanel/ViewPanelV.xaml.vb (100%) rename {3dPrintApp => Icarus}/ViewPanel/ViewPanelVM.vb (100%) rename {3dPrintApp => Icarus}/packages.config (100%) diff --git a/3dPrintApp/MachiningManager/CurrMachiningPanelVM.vb b/3dPrintApp/MachiningManager/CurrMachiningPanelVM.vb deleted file mode 100644 index 0e13c9d..0000000 --- a/3dPrintApp/MachiningManager/CurrMachiningPanelVM.vb +++ /dev/null @@ -1,89 +0,0 @@ -Imports EgtWPFLib5 - -Public Class CurrMachiningPanelVM - Inherits VMBase - -#Region "FIELDS & PROPERTIES" - - Private m_CurrMachining As CurrMachining - Public ReadOnly Property CurrMachining As CurrMachining - Get - Return m_CurrMachining - End Get - End Property - Friend Sub SetCurrMachining(CurrMachining As CurrMachining) - m_CurrMachining = CurrMachining - NotifyPropertyChanged(NameOf(CurrMachining)) - Map.refTopPanelVM.UpdateCurrMachining() - End Sub - - ' Definizione comandi - Private m_cmdOk As ICommand - Private m_cmdCancel As ICommand - -#End Region ' FIELDS & PROPERTIES - -#Region "CONSTRUCTORS" - - Sub New() - ' Creo riferimento a questa classe in Map - Map.SetRefCurrMachiningPanelVM(Me) - End Sub - -#End Region ' CONSTRUCTORS - - Friend Sub ReadMachParamFromSelPart() - If IsNothing(Map.refTopPanelVM.SelPart) Then Return - Dim nData As Integer = 0 - m_CurrMachining = New CurrMachining(Map.refTopPanelVM.SelPart.nPartId) - SetCurrMachining(m_CurrMachining) - ' aggiorno parametri mostrati nella barra - NotifyPropertyChanged(NameOf(CurrMachining)) - Map.refTopPanelVM.UpdateCurrMachining() - End Sub - - -#Region "COMMANDS" - -#Region "Ok" - - Public ReadOnly Property Ok_Command As ICommand - Get - If m_cmdOk Is Nothing Then - m_cmdOk = New Command(AddressOf Ok) - End If - Return m_cmdOk - End Get - End Property - - Public Sub Ok() - ' scrivo i parametri modificati - m_CurrMachining.WriteCurrParamInPart(Map.refTopPanelVM.SelPart.nPartId) - ' ripristino modalita' standard - Map.refTopPanelVM.SelPage = Pages.MODIFY - End Sub - -#End Region ' Ok - -#Region "Cancel" - - Public ReadOnly Property Cancel_Command As ICommand - Get - If m_cmdCancel Is Nothing Then - m_cmdCancel = New Command(AddressOf Cancel) - End If - Return m_cmdCancel - End Get - End Property - - Public Sub Cancel() - ' ripristino modalita' standard - Map.refTopPanelVM.SelPage = Pages.MODIFY - End Sub - -#End Region ' Cancel - -#End Region ' COMMANDS - -End Class - diff --git a/3dPrintApp/TSFEditor/TFSEditorV.xaml b/3dPrintApp/TSFEditor/TFSEditorV.xaml deleted file mode 100644 index 23ab95b..0000000 --- a/3dPrintApp/TSFEditor/TFSEditorV.xaml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - + @@ -178,12 +179,12 @@ Style="{StaticResource ToolBar_Button}"> - + --> @@ -292,5 +293,8 @@ + diff --git a/3dPrintApp/RibPanel/RibPanelV.xaml.vb b/Icarus/RibPanel/RibPanelV.xaml.vb similarity index 100% rename from 3dPrintApp/RibPanel/RibPanelV.xaml.vb rename to Icarus/RibPanel/RibPanelV.xaml.vb diff --git a/3dPrintApp/RibPanel/RibPanelVM.vb b/Icarus/RibPanel/RibPanelVM.vb similarity index 65% rename from 3dPrintApp/RibPanel/RibPanelVM.vb rename to Icarus/RibPanel/RibPanelVM.vb index 54bcecf..19c9de2 100644 --- a/3dPrintApp/RibPanel/RibPanelVM.vb +++ b/Icarus/RibPanel/RibPanelVM.vb @@ -14,6 +14,11 @@ Public Class RibPanelVM POINT = 1 COMPO = 2 End Enum + Public Enum RibSelectionTypes As Integer + CURVE = 1 + EXTRUSION = 2 + BOTH = 3 + End Enum Private m_nPartId As Integer = GDB_ID.NULL Private m_nRibLayerId As Integer = GDB_ID.NULL @@ -38,7 +43,10 @@ Public Class RibPanelVM m_SelRib = value EgtDeselectLayerObjs(m_nRibLayerId) If Not IsNothing(value) Then - EgtSelectObj(value.nId) + EgtSelectObj(value.nCurveId) + EgtSelectObj(value.nExtrusionId) + ' aggiorno visibilita' bottoni edit + NotifyPropertyChanged(NameOf(Compo_Visibility)) ' aggiorno campi di testo posizione NotifyPropertyChanged(NameOf(sXPos)) NotifyPropertyChanged(NameOf(sYPos)) @@ -51,20 +59,23 @@ Public Class RibPanelVM Public Property sXPos As String Get If Not IsNothing(m_SelRib) Then + Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId) Dim b3Reference As New BBox3d - EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference) + EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference) Return LenToString(b3Reference.Min.x, 1) Else Return "" End If End Get Set(value As String) + Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId) Dim b3Reference As New BBox3d - EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference) + EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference) Dim dNewXPos As Double = b3Reference.Min.x StringToLen(value, dNewXPos) If dNewXPos >= 0 AndAlso dNewXPos <= CurrentMachine.b3Tab.DimX Then - EgtMove(m_SelRib.nId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min) + EgtMove(m_SelRib.nCurveId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min) + EgtMove(m_SelRib.nExtrusionId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min) EgtDraw() Else NotifyPropertyChanged(NameOf(sXPos)) @@ -75,20 +86,23 @@ Public Class RibPanelVM Public Property sYPos As String Get If Not IsNothing(m_SelRib) Then + Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId) Dim b3Reference As New BBox3d - EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference) + EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference) Return LenToString(b3Reference.Min.y, 1) Else Return "" End If End Get Set(value As String) + Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId) Dim b3Reference As New BBox3d - EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference) + EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference) Dim dNewYPos As Double = b3Reference.Min.y StringToLen(value, dNewYPos) If dNewYPos >= 0 AndAlso dNewYPos <= CurrentMachine.b3Tab.DimY Then - EgtMove(m_SelRib.nId, New Point3d(b3Reference.Min.x, dNewyPos, b3Reference.Min.z) - b3Reference.Min) + EgtMove(m_SelRib.nCurveId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min) + EgtMove(m_SelRib.nExtrusionId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min) EgtDraw() Else NotifyPropertyChanged(NameOf(sYPos)) @@ -99,20 +113,23 @@ Public Class RibPanelVM Public Property sZPos As String Get If Not IsNothing(m_SelRib) Then + Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId) Dim b3Reference As New BBox3d - EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference) + EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference) Return LenToString(b3Reference.Min.z, 1) Else Return "" End If End Get Set(value As String) + Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId) Dim b3Reference As New BBox3d - EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Reference) + EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference) Dim dNewZPos As Double = b3Reference.Min.y StringToLen(value, dNewZPos) If dNewZPos >= 0 Then - EgtMove(m_SelRib.nId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min) + EgtMove(m_SelRib.nCurveId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min) + EgtMove(m_SelRib.nExtrusionId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min) EgtDraw() Else NotifyPropertyChanged(NameOf(sZPos)) @@ -154,9 +171,13 @@ Public Class RibPanelVM NotifyPropertyChanged(NameOf(sRotAngle)) Return End If + Dim nId As Integer = If(m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, m_SelRib.nCurveId, m_SelRib.nExtrusionId) Dim b3Rib As New BBox3d - EgtGetBBoxGlob(m_SelRib.nId, GDB_BB.STANDARD, b3Rib) - If EgtRotate(m_SelRib.nId, b3Rib.Center, vtSelRotAxes, dNewAngle) Then + EgtGetBBox(nId, GDB_BB.STANDARD, b3Rib) + Dim bOk As Boolean = False + bOk = EgtRotate(nId, b3Rib.Center(), vtSelRotAxes, dNewAngle) + If bOk AndAlso m_SelRib.Type = RibEntity.RibTypes.FROMDRAW Then EgtRotate(m_SelRib.nExtrusionId, b3Rib.Center, vtSelRotAxes, dNewAngle) + If bOk Then EgtDraw() RefreshPos() m_sRotAngle = 0 @@ -173,16 +194,18 @@ Public Class RibPanelVM Return m_bAdd_IsChecked End Get Set(value As Boolean) - m_bAdd_IsChecked = value - If value Then - m_bEdit_IsChecked = False - m_bGrid_IsChecked = False - m_bMove_IsChecked = False - m_bRotate_IsChecked = False - NotifyPropertyChanged(NameOf(bEdit_IsChecked)) - NotifyPropertyChanged(NameOf(bGrid_IsChecked)) - NotifyPropertyChanged(NameOf(bMove_IsChecked)) - NotifyPropertyChanged(NameOf(bRotate_IsChecked)) + If Not m_bMachParam_IsChecked Then + m_bAdd_IsChecked = value + If value Then + m_bEdit_IsChecked = False + m_bGrid_IsChecked = False + m_bMove_IsChecked = False + m_bRotate_IsChecked = False + NotifyPropertyChanged(NameOf(bEdit_IsChecked)) + NotifyPropertyChanged(NameOf(bGrid_IsChecked)) + NotifyPropertyChanged(NameOf(bMove_IsChecked)) + NotifyPropertyChanged(NameOf(bRotate_IsChecked)) + End If End If End Set End Property @@ -193,7 +216,7 @@ Public Class RibPanelVM Return m_bEdit_IsChecked End Get Set(value As Boolean) - If Not IsNothing(m_SelRib) Then + If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then m_bEdit_IsChecked = value If value Then m_bAdd_IsChecked = False @@ -217,16 +240,18 @@ Public Class RibPanelVM Return m_bGrid_IsChecked End Get Set(value As Boolean) - m_bGrid_IsChecked = value - If value Then - m_bAdd_IsChecked = False - m_bEdit_IsChecked = False - m_bMove_IsChecked = False - m_bRotate_IsChecked = False - NotifyPropertyChanged(NameOf(bAdd_IsChecked)) - NotifyPropertyChanged(NameOf(bEdit_IsChecked)) - NotifyPropertyChanged(NameOf(bMove_IsChecked)) - NotifyPropertyChanged(NameOf(bRotate_IsChecked)) + If Not m_bMachParam_IsChecked Then + m_bGrid_IsChecked = value + If value Then + m_bAdd_IsChecked = False + m_bEdit_IsChecked = False + m_bMove_IsChecked = False + m_bRotate_IsChecked = False + NotifyPropertyChanged(NameOf(bAdd_IsChecked)) + NotifyPropertyChanged(NameOf(bEdit_IsChecked)) + NotifyPropertyChanged(NameOf(bMove_IsChecked)) + NotifyPropertyChanged(NameOf(bRotate_IsChecked)) + End If End If End Set End Property @@ -237,7 +262,7 @@ Public Class RibPanelVM Return m_bMove_IsChecked End Get Set(value As Boolean) - If Not IsNothing(m_SelRib) Then + If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then m_bMove_IsChecked = value If value Then m_bAdd_IsChecked = False @@ -261,7 +286,7 @@ Public Class RibPanelVM Return m_bRotate_IsChecked End Get Set(value As Boolean) - If Not IsNothing(m_SelRib) Then + If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then m_bRotate_IsChecked = value If value Then m_bAdd_IsChecked = False @@ -279,6 +304,48 @@ Public Class RibPanelVM End Set End Property + Private m_bMachParam_IsChecked As Boolean + Public Property bMachParam_IsChecked As Boolean + Get + Return m_bMachParam_IsChecked + End Get + Set(value As Boolean) + If Not IsNothing(m_SelRib) AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then + m_bMachParam_IsChecked = True + m_bAdd_IsChecked = False + m_bEdit_IsChecked = False + m_bGrid_IsChecked = False + m_bMove_IsChecked = False + m_bRotate_IsChecked = False + NotifyPropertyChanged(NameOf(bAdd_IsChecked)) + NotifyPropertyChanged(NameOf(bEdit_IsChecked)) + NotifyPropertyChanged(NameOf(bGrid_IsChecked)) + NotifyPropertyChanged(NameOf(bMove_IsChecked)) + NotifyPropertyChanged(NameOf(bRotate_IsChecked)) + Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.RIBPARAM) + NotifyPropertyChanged(NameOf(RibList_IsEnabled)) + Else + NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked)) + End If + End Set + End Property + Friend Sub ResetMachParamIsChecked() + m_bMachParam_IsChecked = False + NotifyPropertyChanged(NameOf(bMachParam_IsChecked)) + NotifyPropertyChanged(NameOf(RibList_IsEnabled)) + End Sub + + Public ReadOnly Property Compo_Visibility As Visibility + Get + Return If(Not IsNothing(m_SelRib) AndAlso m_SelRib.Type = RibEntity.RibTypes.FROMDRAW, Visibility.Visible, Visibility.Collapsed) + End Get + End Property + + Public ReadOnly Property RibList_IsEnabled As Boolean + Get + Return Not m_bMachParam_IsChecked + End Get + End Property ' riferimento griglia all'ingresso in questa pagina Private m_OriginalGridFrame As New Frame3d @@ -296,13 +363,15 @@ Public Class RibPanelVM End Get End Property + ' Definizione comandi Private m_cmdImport As ICommand - Private m_cmdPoint As ICommand Private m_cmdLine2P As ICommand + Private m_cmdDelete As ICommand Private m_cmdModifyCurve As ICommand Private m_cmdAddPointCurve As ICommand Private m_cmdRemovePointCurve As ICommand + Private m_cmdExtrude As ICommand Private m_cmdCPlaneTop As ICommand Private m_cmdCPlaneFront As ICommand Private m_cmdCPlaneRight As ICommand @@ -317,7 +386,8 @@ Public Class RibPanelVM Private m_cmdCPlanePerpObj As ICommand Private m_cmdCPlaneObj As ICommand Private m_cmdDragMove As ICommand - Private m_cmdDelete As ICommand + Private m_cmdDragRotate As ICommand + Private m_cmdMachParam As ICommand #End Region ' FIELDS & PROPERTIES @@ -344,7 +414,21 @@ Public Class RibPanelVM m_RibList.Clear() Dim nRibId As Integer = EgtGetFirstInGroup(m_nRibLayerId) While nRibId <> GDB_ID.NULL - m_RibList.Add(New RibEntity(nRibId)) + Dim EntityType As GDB_TY = EgtGetType(nRibId) + Dim DrawType As Integer = RibEntity.RibTypes.FROMDRAW + EgtGetInfo(nRibId, KEY_RIB_TYPE, DrawType) + If EntityType = GDB_TY.CRV_COMPO AndAlso DrawType = RibEntity.RibTypes.FROMDRAW Then + Dim nExtrusionId As Integer = GDB_ID.NULL + EgtGetInfo(nRibId, KEY_EXTRUSION_ID, nExtrusionId) + Dim RibEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMDRAW, nRibId) + If nExtrusionId <> GDB_ID.NULL Then + RibEntity.SetExtrusionId(nExtrusionId) + End If + m_RibList.Add(RibEntity) + ElseIf (EntityType = GDB_TY.SRF_BEZ OrElse EntityType = GDB_TY.SRF_MESH OrElse EntityType = GDB_TY.SRF_FRGN) AndAlso DrawType = RibEntity.RibTypes.FROMIMPORT Then + Dim RibEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMIMPORT, nRibId) + m_RibList.Add(RibEntity) + End If nRibId = EgtGetNext(nRibId) End While If m_RibList.Count > 0 Then @@ -357,6 +441,12 @@ Public Class RibPanelVM Friend Sub Dispose() ' ripristino frame originale EgtSetGridFrame(m_OriginalGridFrame) + ' se in modifica parametri + If m_bMachParam_IsChecked Then + ' ripristino modalita' standard + Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL) + Map.refRibPanelVM.ResetMachParamIsChecked() + End If EgtDraw() Map.refSceneHostVM.MainScene.SetStatusNull() End Sub @@ -367,12 +457,27 @@ Public Class RibPanelVM NotifyPropertyChanged(NameOf(sZPos)) End Sub - Private Function InitCommand() As Boolean + Private Function InitCommand(RibSelectionType As RibSelectionTypes) As Boolean ' attivo modifiche su scena Map.refSceneHostVM.MainScene.ResetStatus() + ' rendo traspanete estrusione + EgtSetAlpha(m_SelRib.nExtrusionId, 50) ' seleziono percorso corrente EgtDeselectAll() - EgtSelectObj(m_SelRib.nId) + Select Case RibSelectionType + Case RibSelectionTypes.CURVE + EgtSelectObj(m_SelRib.nCurveId) + Case RibSelectionTypes.EXTRUSION + ' creo layer per estrusione + Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId) + EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION) + EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId) + EgtSelectObj(m_SelRib.nCurveId) + Case RibSelectionTypes.BOTH + EgtSelectObj(m_SelRib.nCurveId) + EgtSelectObj(m_SelRib.nExtrusionId) + End Select + EgtDraw() End Function Friend Sub UpdateUi() @@ -381,53 +486,96 @@ Public Class RibPanelVM End Sub Friend Sub OnExecCmdEnd(command As Controller.CMD) + Select Case command + Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE + ' leggo altezza estrusione + Dim dExtrusionLength As Double = 0 + EgtGetInfo(m_SelRib.nExtrusionId, KEY_EXTRUSION_LENGTH, dExtrusionLength) + ' cancello estrusione + EgtErase(m_SelRib.nExtrusionId) + Dim nNewEntityId As Integer = EgtCreateSurfTmByRegionExtrusion(m_nRibLayerId, 1, {m_SelRib.nCurveId}, Vector3d.Z_AX * dExtrusionLength, EPS_STM) + EgtSetName(nNewEntityId, RIB_EXTRUSION) + EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength) + ' coloro l'entita' di blu + Dim c3LightBlue As Color3d + c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid) + EgtSetColor(nNewEntityId, c3LightBlue) + ' aggiorno riferimento nella curva + m_SelRib.SetExtrusionId(nNewEntityId) + ' seleziono nuova estrusione + EgtSelectObj(m_SelRib.nExtrusionId) + ' ripristino trasparenza estrusione + EgtSetAlpha(m_SelRib.nExtrusionId, 100) + EgtDraw() + ' rimetto la selezione scena a null + Map.refSceneHostVM.MainScene.SetStatusNull() + Case Controller.CMD.MOVE, Controller.CMD.ROTATE + EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100) + ' seleziono nuova estrusione + EgtSelectObj(m_SelRib.nExtrusionId) + EgtDraw() + ' rimetto la selezione scena a null + Map.refSceneHostVM.MainScene.SetStatusNull() + Case Controller.CMD.GRID_ELEVATION, Controller.CMD.GRID_3P, Controller.CMD.GRID_ORIGIN, Controller.CMD.GRID_PERPCURVE, Controller.CMD.GRID_ROTATE, Controller.CMD.GRID_ROTATE3D + ' rimetto la selezione scena a null + Map.refSceneHostVM.MainScene.SetStatusNull() + End Select If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return ' se finita creazione estrusione If m_bIsCreatingExtrusion Then - Dim NewEntity As RibEntity = Nothing m_bIsCreatingExtrusion = False + ' se riferimento non nullo, elimino vecchia estrusione + If m_SelRib.nExtrusionId <> GDB_ID.NULL Then + EgtErase(m_SelRib.nExtrusionId) + End If + Dim NewEntity As RibEntity = Nothing Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION) Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewExtrusionLayerId) Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId) If NewGeomType = GDB_TY.SRF_FRGN OrElse NewGeomType = GDB_TY.SRF_MESH Then EgtSetName(nNewEntityId, RIB_EXTRUSION) + Dim dExtrusionLength As Double = 0 + StringToLen(Map.refControllerInputPanelVM.Text, dExtrusionLength) + EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength) ' coloro l'entita' di blu Dim c3LightBlue As Color3d c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid) EgtSetColor(nNewEntityId, c3LightBlue) '' lo sposto nel layer dei rib EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON) - '' lo aggiungo alla lista - NewEntity = New RibEntity(nNewEntityId) - m_RibList.Add(NewEntity) - ' cancello layer - Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB) - EgtErase(nNewRibLayerId) - EgtErase(nNewExtrusionLayerId) + ' aggiungo riferimento a curva + m_SelRib.SetExtrusionId(nNewEntityId) End If + ' cancello layer estrusione + EgtErase(nNewExtrusionLayerId) ' aggiorno posizione RefreshPos() - ' se aggiunta entita' - If Not IsNothing(NewEntity) Then - SelRib = NewEntity - NotifyPropertyChanged(NameOf(SelRib)) - End If + EgtDraw() ' rimetto la selezione scena a null Map.refSceneHostVM.MainScene.SetStatusNull() End If ' se finita creazione curva If bIsCreatingPath Then - Dim NewEntity As RibEntity = Nothing m_bIsCreatingPath = False + Dim NewEntity As RibEntity = Nothing Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB) Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewRibLayerId) Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId) If NewGeomType = GDB_TY.CRV_COMPO Then - EgtSetName(nNewEntityId, RIB_EXTRUSION) + EgtSetName(nNewEntityId, RIB_CURVE) ' coloro l'entita' di blu Dim c3LightBlue As Color3d c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid) EgtSetColor(nNewEntityId, c3LightBlue) + ' lo sposto nel layer dei rib + EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON) + ' lo aggiungo alla lista + NewEntity = New RibEntity(RibEntity.RibTypes.FROMDRAW, nNewEntityId) + m_RibList.Add(NewEntity) + ' lo seleziono + SelRib = NewEntity + NotifyPropertyChanged(NameOf(SelRib)) + ' creo layer per estrusione Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId) EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION) EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId) @@ -438,32 +586,12 @@ Public Class RibPanelVM m_bIsCreatingExtrusion = True Else ' cancello layer - EgtErase(nNewRibLayerId) + 'EgtErase(nNewRibLayerId) EgtErase(nNewExtrusionLayerId) End If - - '' lo sposto nel layer degli start - 'EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON) - '' lo aggiungo alla lista - 'NewEntity = New RibEntity(nNewEntityId) - 'm_RibList.Add(NewEntity) - '' cancello layer di disegno - 'EgtErase(nNewRibLayerId) End If - 'If NewGeomType = GDB_TY.CRV_COMPO Then - ' EgtSetName(nNewEntityId, RIB_GEOM) - ' ' coloro l'entita' di blu - ' Dim c3LightBlue As Color3d - ' c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid) - ' EgtSetColor(nNewEntityId, c3LightBlue) - ' ' lo sposto nel layer degli start - ' EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON) - ' ' lo aggiungo alla lista - ' NewEntity = New RibEntity(nNewEntityId) - ' m_RibList.Add(NewEntity) - ' ' cancello layer di disegno - ' EgtErase(nNewRibLayerId) - 'End If + ' cancello layer di disegno + EgtErase(nNewRibLayerId) End If End Sub @@ -478,17 +606,46 @@ Public Class RibPanelVM End Function Friend Sub SelStartFromId(nId) - Dim SelRibEntity As RibEntity = m_RibList.FirstOrDefault(Function(x) x.nId = nId) + Dim SelRibEntity As RibEntity = m_RibList.FirstOrDefault(Function(x) x.nCurveId = nId OrElse x.nExtrusionId = nId) If Not IsNothing(SelRibEntity) Then SelRib = SelRibEntity NotifyPropertyChanged(NameOf(SelRib)) End If End Sub + Friend Sub SelLastRib() + If RibList.Count <= 0 Then Return + SelRib = RibList(RibList.Count - 1) + NotifyPropertyChanged(NameOf(SelRib)) + End Sub + #End Region ' METHODS #Region "COMMANDS" +#Region "Import" + + ''' + ''' Returns a command that do CPlaneTop. + ''' + Public ReadOnly Property Import_Command As ICommand + Get + If m_cmdImport Is Nothing Then + m_cmdImport = New Command(AddressOf Import) + End If + Return m_cmdImport + End Get + End Property + + ''' + ''' Execute the CPlaneTop. This method is invoked by the CPlaneTopCommand. + ''' + Public Sub Import(ByVal param As Object) + Map.refSceneHostVM.InsertRib() + End Sub + +#End Region ' Import + #Region "Line2P" ''' @@ -518,6 +675,43 @@ Public Class RibPanelVM #End Region ' Line2P +#Region "Delete" + + Public ReadOnly Property Delete_Command As ICommand + Get + If m_cmdDelete Is Nothing Then + m_cmdDelete = New Command(AddressOf Delete) + End If + Return m_cmdDelete + End Get + End Property + + Public Sub Delete() + If IsNothing(SelRib) Then Return + Dim bOk As Boolean = False + Select Case m_SelRib.Type + Case RibEntity.RibTypes.FROMDRAW + bOk = EgtErase(m_SelRib.nCurveId) + If bOk Then EgtErase(m_SelRib.nExtrusionId) + Case RibEntity.RibTypes.FROMIMPORT + bOk = EgtErase(m_SelRib.nExtrusionId) + End Select + If bOk Then + Dim nSelStartIndex As Integer = m_RibList.IndexOf(SelRib) + m_RibList.Remove(SelRib) + If nSelStartIndex < m_RibList.Count Then + SelRib = m_RibList(nSelStartIndex) + ElseIf m_RibList.Count > 0 Then + SelRib = m_RibList(m_RibList.Count - 1) + Else + SelRib = Nothing + End If + NotifyPropertyChanged(NameOf(SelRib)) + End If + End Sub + +#End Region ' Delete + #Region "ModifyCurve" ''' @@ -536,7 +730,7 @@ Public Class RibPanelVM ''' Execute the LinearDimension. This method is invoked by the LinDimCommand. ''' Public Sub ModifyCurve(ByVal param As Object) - InitCommand() + InitCommand(RibSelectionTypes.CURVE) Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE) End Sub @@ -560,7 +754,7 @@ Public Class RibPanelVM ''' Execute the LinearDimension. This method is invoked by the LinDimCommand. ''' Public Sub AddPointCurve(ByVal param As Object) - InitCommand() + InitCommand(RibSelectionTypes.CURVE) If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC) Else @@ -588,17 +782,42 @@ Public Class RibPanelVM ''' Execute the LinearDimension. This method is invoked by the LinDimCommand. ''' Public Sub RemovePointCurve(ByVal param As Object) + InitCommand(RibSelectionTypes.CURVE) If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then - InitCommand() Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE) Else - InitCommand() Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.REMOVEPOINTCURVE) End If End Sub #End Region ' RemovePointCurve +#Region "Extrude" + + ''' + ''' Returns a command that do Extrude. + ''' + Public ReadOnly Property Extrude_Command As ICommand + Get + If m_cmdExtrude Is Nothing Then + m_cmdExtrude = New Command(AddressOf Extrude) + End If + Return m_cmdExtrude + End Get + End Property + + ''' + ''' Execute the Extrude. This method is invoked by the ExtrudeCommand. + ''' + Public Sub Extrude(ByVal param As Object) + InitCommand(RibSelectionTypes.EXTRUSION) + If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then + m_bIsCreatingExtrusion = True + End If + End Sub + +#End Region ' Extrude + #Region "CPlaneTop" ''' @@ -897,40 +1116,57 @@ Public Class RibPanelVM End Property Public Sub DragMove() - InitCommand() + InitCommand(RibSelectionTypes.BOTH) Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE) End Sub #End Region ' DragMove -#Region "Delete" +#Region "DragRotate" - Public ReadOnly Property Delete_Command As ICommand + Public ReadOnly Property DragRotate_Command As ICommand Get - If m_cmdDelete Is Nothing Then - m_cmdDelete = New Command(AddressOf Delete) + If m_cmdDragRotate Is Nothing Then + m_cmdDragRotate = New Command(AddressOf DragRotate) End If - Return m_cmdDelete + Return m_cmdDragRotate End Get End Property - Public Sub Delete() - If IsNothing(SelRib) Then Return - If EgtErase(m_SelRib.nId) Then - Dim nSelStartIndex As Integer = m_RibList.IndexOf(SelRib) - m_RibList.Remove(SelRib) - If nSelStartIndex < m_RibList.Count Then - SelRib = m_RibList(nSelStartIndex) - ElseIf m_RibList.Count > 0 Then - SelRib = m_RibList(m_RibList.Count - 1) - Else - SelRib = Nothing - End If - NotifyPropertyChanged(NameOf(SelRib)) - End If + Public Sub DragRotate() + InitCommand(RibSelectionTypes.BOTH) + Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.ROTATE) End Sub -#End Region ' Delete +#End Region ' DragRotate + +#Region "MachParam" + + Public ReadOnly Property MachParam_Command As ICommand + Get + If m_cmdMachParam Is Nothing Then + m_cmdMachParam = New Command(AddressOf MachParam) + End If + Return m_cmdMachParam + End Get + End Property + + Public Sub MachParam() + If IsNothing(Map.refTopPanelVM.SelMachining) Then Return + m_bAdd_IsChecked = False + m_bEdit_IsChecked = False + m_bGrid_IsChecked = False + m_bMove_IsChecked = False + m_bRotate_IsChecked = False + NotifyPropertyChanged(NameOf(bAdd_IsChecked)) + NotifyPropertyChanged(NameOf(bEdit_IsChecked)) + NotifyPropertyChanged(NameOf(bGrid_IsChecked)) + NotifyPropertyChanged(NameOf(bMove_IsChecked)) + NotifyPropertyChanged(NameOf(bRotate_IsChecked)) + Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.RIBPARAM) + End Sub + +#End Region ' MachParam #End Region ' COMMANDS @@ -939,6 +1175,11 @@ End Class Public Class RibEntity Inherits VMBase + Public Enum RibTypes As Integer + FROMDRAW = 1 + FROMIMPORT = 2 + End Enum + Private Shared m_nSharedIndex As Integer = 0 Private ReadOnly Property nSharedIndex As Integer Get @@ -950,13 +1191,31 @@ Public Class RibEntity m_nSharedIndex = 0 End Sub - Private m_nId As Integer - Public ReadOnly Property nId As Integer + Private m_Type As RibTypes + Public ReadOnly Property Type As RibTypes Get - Return m_nId + Return m_Type End Get End Property + Private m_nCurveId As Integer = GDB_ID.NULL + Public ReadOnly Property nCurveId As Integer + Get + Return m_nCurveId + End Get + End Property + + Private m_nExtrusionId As Integer = GDB_ID.NULL + Public ReadOnly Property nExtrusionId As Integer + Get + Return m_nExtrusionId + End Get + End Property + Friend Sub SetExtrusionId(nId As Integer) + m_nExtrusionId = nId + EgtSetInfo(m_nCurveId, KEY_EXTRUSION_ID, m_nExtrusionId) + End Sub + Private m_nIndex As Integer Public ReadOnly Property nIndex As Integer Get @@ -966,13 +1225,20 @@ Public Class RibEntity Public ReadOnly Property ghName As String Get - Return String.Format("[{0}] {1}", {m_nIndex, "Rib"}) + Return String.Format("[{0}] {1}", {m_nIndex, If(m_Type = RibTypes.FROMDRAW, "Draw Rib", "Import Rib")}) End Get End Property - Sub New(nId As Integer) - m_nId = nId + Sub New(Type As RibTypes, nId As Integer) m_nIndex = nSharedIndex + m_Type = Type + EgtSetInfo(nId, KEY_RIB_TYPE, Type) + Select Case Type + Case RibTypes.FROMDRAW + m_nCurveId = nId + Case RibTypes.FROMIMPORT + m_nExtrusionId = nId + End Select End Sub End Class diff --git a/Icarus/RibParamPanel/RibParamPanelV.xaml b/Icarus/RibParamPanel/RibParamPanelV.xaml new file mode 100644 index 0000000..470520d --- /dev/null +++ b/Icarus/RibParamPanel/RibParamPanelV.xaml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +