Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DMDesign
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Amanda Ghassaei
DMDesign
Commits
96dd8b71
Commit
96dd8b71
authored
9 years ago
by
Amanda Ghassaei
Browse files
Options
Downloads
Patches
Plain Diff
formatting
parent
e52de847
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
css/main.css
+1
-0
1 addition, 0 deletions
css/main.css
js/menus/AssemblerSetupMenuView.js
+12
-1
12 additions, 1 deletion
js/menus/AssemblerSetupMenuView.js
js/menus/templates/AssemblerSetupMenuView.html
+7
-8
7 additions, 8 deletions
js/menus/templates/AssemblerSetupMenuView.html
with
20 additions
and
9 deletions
css/main.css
+
1
−
0
View file @
96dd8b71
...
...
@@ -470,6 +470,7 @@ label {
.alternatingColorList
>
label
{
padding-right
:
10px
;
padding-left
:
15px
;
width
:
100%
;
}
...
...
This diff is collapsed.
Click to expand it.
js/menus/AssemblerSetupMenuView.js
+
12
−
1
View file @
96dd8b71
...
...
@@ -61,7 +61,18 @@ define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'text!assembler
},
_makeTemplateJSON
:
function
(){
return
_
.
extend
(
this
.
model
.
toJSON
(),
cam
.
toJSON
(),
cam
.
get
(
"
assembler
"
).
toJSON
());
return
_
.
extend
(
this
.
model
.
toJSON
(),
cam
.
toJSON
(),
cam
.
get
(
"
assembler
"
).
toJSON
(),
{
customFns
:
{
customFunctionsContext
:
"
Context Variables
"
,
customCalcPositionOffsets
:
"
Calc Position Offsets
"
,
customHeader
:
"
Header
"
,
customHome
:
"
Go Home
"
,
customMoveXY
:
"
Move XY
"
,
customChangeZLayer
:
"
Change Z
"
,
customPlacePart
:
"
Place Part
"
,
customFooter
:
"
Footer
"
}}
);
},
template
:
_
.
template
(
template
)
...
...
This diff is collapsed.
Click to expand it.
js/menus/templates/AssemblerSetupMenuView.html
+
7
−
8
View file @
96dd8b71
...
...
@@ -21,13 +21,12 @@ Rotation (xyz):
Scale:
<input
data-property=
"scale"
value=
"<%= scale %>"
placeholder=
"Scale"
class=
"form-control floatInput assembler"
type=
"text"
><br/><br/>
Edit Code:
<br/><br/>
Context Variables
<a
class=
"editMachineCode"
data-name=
"customFunctionsContext"
href=
"#"
>
Edit
</a><br/>
Position Offsets
<a
class=
"editMachineCode"
data-name=
"customCalcPositionOffsets"
href=
"#"
>
Edit
</a><br/>
Header
<a
class=
"editMachineCode"
data-name=
"customHeader"
href=
"#"
>
Edit
</a><br/>
Go Home
<a
class=
"editMachineCode"
data-name=
"customHome"
href=
"#"
>
Edit
</a><br/>
<
%
var
treeLevel =
0;
_.each
(
customFns
,
function
(
description
,
key
){
%
>
<
%
treeLevel
++;
%
>
<div
class=
"alternatingColorList<% if (treeLevel%2 == 0){ %> evenListItem <% } %>"
>
<label><
%=
description
%
>
<a
class=
"editMachineCode pull-right"
data-name=
"<%= key %>"
href=
"#"
>
Edit
</a></label>
</div><br/>
<
%
});
%
><br/>
<!--Pick up stock <a class="editMachineCode" data-name="customHeader" href="#">Edit</a><br/>-->
Move XY
<a
class=
"editMachineCode"
data-name=
"customMoveXY"
href=
"#"
>
Edit
</a><br/>
Change Z
<a
class=
"editMachineCode"
data-name=
"customChangeZLayer"
href=
"#"
>
Edit
</a><br/>
Place part
<a
class=
"editMachineCode"
data-name=
"customPlacePart"
href=
"#"
>
Edit
</a><br/>
Footer
<a
class=
"editMachineCode"
data-name=
"customFooter"
href=
"#"
>
Edit
</a><br/><br/>
<a
href=
"#"
id=
"saveMachineConfig"
class=
" btn btn-block btn-lg btn-success"
>
Save Machine Files
</a><br/>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment