Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
Protos
Nomad 3D
nomad-3d-editor
Commits
c37c4c85
Commit
c37c4c85
authored
Apr 13, 2021
by
legoc
Browse files
Reset nomad to true
parent
49d476c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
.classpath
View file @
c37c4c85
...
...
@@ -15,7 +15,6 @@
</classpathentry>
<classpathentry
kind=
"con"
path=
"org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"
>
<attributes>
<attribute
name=
"module"
value=
"true"
/>
<attribute
name=
"maven.pomderived"
value=
"true"
/>
</attributes>
</classpathentry>
...
...
script/merge-script.sh
View file @
c37c4c85
...
...
@@ -4,4 +4,8 @@
#
# Forcing to use more RAM (4GB) than default (2GB).
#node --max-old-space-size=4096 /home/briac/Documents/Nomad3D/nomad-3d-viewer/js/merger/index-merger.js -- $1 $2 $3 $4
# In command line:
#node --max-old-space-size=4096 /users/legoc/nomad3d-summer2020/nomad-3d-viewer/js/merger/index-merger.js -- -view /users/legoc/nomad3d-summer2020/models/views/thales/ThALES-view.xml -geometries /users/legoc/nomad3d-summer2020/models/edited/thales
#node --max-old-space-size=4096 /users/legoc/nomad3d-summer2020/nomad-3d-viewer/js/merger/index-merger.js -- $1 $2 $3 $4
\ No newline at end of file
src/main/java/fr/ill/ics/n3d/Nomad3DEditor.java
View file @
c37c4c85
...
...
@@ -143,7 +143,7 @@ public class Nomad3DEditor extends Application {
Locale
.
setDefault
(
Locale
.
US
);
boolean
nomad
=
fals
e
;
boolean
nomad
=
tru
e
;
// Analyse arguments.
for
(
int
i
=
0
;
i
<
args
.
length
;
++
i
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment