Commit b7f69000 authored by Ruben Jesus Garcia Hernandez's avatar Ruben Jesus Garcia Hernandez
Browse files

Add updated copyright notice

Add default marker colour
Add atom selection
parent 47e8857e
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
......@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
......@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
*/
/* Copyright 2017 Google Inc. All rights reserved.
......
......@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
*/
/* Copyright 2017 Google Inc. All rights reserved.
......
......@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
*/
/* Copyright 2017 Google Inc. All rights reserved.
*
......
/*# Copyright 2016-2018 The NOMAD Developers Group*/
/*# Copyright 2016-2018 Ruben Jesus Garcia Hernandez*/
/*
* Copyright 2016 Google Inc. All Rights Reserved.
*
......
/*# Copyright 2016-2018 The NOMAD Developers Group*/
/*# Copyright 2016-2018 Ruben Jesus Garcia Hernandez*/
/* Copyright 2016 Google Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......@@ -735,12 +735,21 @@ int loadConfigFile(const char * f)
if (markers && !markercolours) {
markercolours=new float* [TIMESTEPS];
float mc [4];
if (fabs (BACKGROUND[0]-0.5) < 0.1 && fabs (BACKGROUND[1]-0.5) < 0.1 && fabs (BACKGROUND[2]-0.5) < 0.1) //almost grey
for (int j = 0; j < 3; j++) {
mc[j]=0.0f;
}
else
for (int j = 0; j < 3; j++) {
mc[j]=1-BACKGROUND[j];
}
mc[3]=0.5;
for (int i=0;i<TIMESTEPS;i++) {
markercolours[i]=new float[4];
for (int j = 0; j < 3; j++) {
markercolours [i][j]=1-BACKGROUND[j];
for (int j = 0; j < 4; j++) {
markercolours [i][j]=mc[j];
}
markercolours[i][3]=0.5;
}
}
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
/*
# Copyright 2016-2018 The NOMAD Developers Group
# Copyright 2016-2018 Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment