From de256acb96e587572a1615bc029455e7ccf4d6a3 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Tue, 25 Oct 2016 02:09:54 -0700 Subject: [PATCH] stubs for import stl action --- web/app/3d/actions/operation-actions.js | 4 ++++ web/app/3d/menu/menu-config.js | 2 +- web/app/3d/operations.js | 6 ++++++ web/app/3d/ui/ctrl.js | 2 ++ web/img/3d/stl32.png | Bin 0 -> 1567 bytes web/img/3d/stl96.png | Bin 0 -> 5362 bytes 6 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 web/img/3d/stl32.png create mode 100644 web/img/3d/stl96.png diff --git a/web/app/3d/actions/operation-actions.js b/web/app/3d/actions/operation-actions.js index 41d84ebb..a52a0f49 100644 --- a/web/app/3d/actions/operation-actions.js +++ b/web/app/3d/actions/operation-actions.js @@ -46,6 +46,10 @@ export const OperationActions = { 'UNION': mergeInfo('UNION', { info: 'union operation on two solids' + }), + + 'IMPORT_STL': mergeInfo('IMPORT_STL', { + info: 'union operation on two solids' }) }; diff --git a/web/app/3d/menu/menu-config.js b/web/app/3d/menu/menu-config.js index bd489858..b3161498 100644 --- a/web/app/3d/menu/menu-config.js +++ b/web/app/3d/menu/menu-config.js @@ -1,7 +1,7 @@ export const file = { label: 'file', cssIcons: ['file'], - actions: ['Save', 'StlExport'] + actions: ['Save', 'StlExport', '-', 'IMPORT_STL'] }; export const craft = { diff --git a/web/app/3d/operations.js b/web/app/3d/operations.js index cdd8b47f..79e297f3 100644 --- a/web/app/3d/operations.js +++ b/web/app/3d/operations.js @@ -54,6 +54,12 @@ export const UNION = { info: (p) => null }; +export const IMPORT_STL = { + icon: 'img/3d/stl', + label: 'STL Import', + info: (p) => null +}; + function r(value) { return value.toPrecision(4).replace(/\.0$/, ''); } \ No newline at end of file diff --git a/web/app/3d/ui/ctrl.js b/web/app/3d/ui/ctrl.js index cb2ac774..ed930e0e 100644 --- a/web/app/3d/ui/ctrl.js +++ b/web/app/3d/ui/ctrl.js @@ -154,6 +154,8 @@ UI.prototype.initOperation = function(op) { this.registerWizard(new PlaneWizard(this.app.viewer), false) } else if ('SPHERE' === op) { this.registerWizard(new SphereWizard(this.app.viewer), false) + } else if ('IMPORT_STL' === op) { + alert('men at work'); } else { console.log('unknown operation'); } diff --git a/web/img/3d/stl32.png b/web/img/3d/stl32.png new file mode 100644 index 0000000000000000000000000000000000000000..6f54e56f7759c57fd217c61e6ca5e8da6f2f042f GIT binary patch literal 1567 zcmYL}dobB>J{=Xhv13jpa5iw%KX7CQjq zoaTbTp&alO6vpBNhOpSi@GT^o2}XoMfgr>QH)e*jB7-bizmCH*c5Tj}1aMe@DbD0D zXo3Sx4{6~{kKk}e2qyYflLWX&X|u;8G=c@d^uJTsuI2%2a^F3$12)Csyi_5K6gLqW zChP#<-x9L1I0p-uO@S83iev%b^R%{aK8#g1u{&&u#r}VZu?eB&*d28MK)t6@j(K>Y z7xKFuf==w{T>O6Wz7h*)#N zydE4Zr_pFVpt13D9UYy*m5#(f6mV~8HNgegs22)_Yf`Cs!r8Ox!{g%{Tz`KF9g7uH zz{px;R=c+omD+8quCD&mH*U9WY5&#S+}w)MQEzJ~+oUt6u<(wkukYu9fq|is_1=Y8 z(PBKB6BBbH@7lFQyW5!<1qFNbd?Ca~hTO<-a+OHTG z7#J^ViG_R+*kA@@_xy<5FmEUtj#=yo@6o zaR!bdQ_pg#9UUFMHa0eG%gf6u2k^q?=H0wk} zK7AsQH=EZ~(9~oJthI@6y-e0r7B z<&DLPwxEda4fXY9I@y<=r?Z_WleAjNG4etoxZG1@_?viibTrlVaO*@ivntDr_weB% zs#CiBphS06Mh%HHB=SG;Pq{J}jFYENyY%+<&J7L@YOyR5E&>(n89%n9d5lz6R?1;8 zn8fU4@Llq`<4ef7H`HZ3BO)Rm zP2FO9R$c2JR~Ko&LDm66JB^08vm&FItOr|_KopiulPR~oJ~tQYpl?%<+ht6yLHM7K zD;Rsho3^rN5O5!JX4ZvrXtQXvky8sPBO_z7?08Fp&pv~l00ta(ufZbnF`20nYm6estf$mxZ0|N+GvL4-z zKiu#wZ<}ZZXjIg5d%NLCLK0-HX#2eypZCS(1^g=l MR2yf?J(7R&KbiZ#j{pDw literal 0 HcmV?d00001 diff --git a/web/img/3d/stl96.png b/web/img/3d/stl96.png new file mode 100644 index 0000000000000000000000000000000000000000..55e581a2ded971f0f8404a1623741535224aabf6 GIT binary patch literal 5362 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