Changeset 2612 in main


Ignore:
Timestamp:
12/23/14 17:06:31 (4 years ago)
Author:
pjoulaud
Message:

s/DEPRECATED/OBSOLETE/g

Location:
trunk/openPLM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/openPLM/apps/document3D/static/js/3D/three-min.js

    r2114 r2612  
    9898this.y*h;this.z=e*g+this.z*h;return this},clone:function(){return new THREE.Quaternion(this.x,this.y,this.z,this.w)}}; 
    9999THREE.Quaternion.slerp=function(a,b,c,d){var e=a.w*b.w+a.x*b.x+a.y*b.y+a.z*b.z;0>e?(c.w=-b.w,c.x=-b.x,c.y=-b.y,c.z=-b.z,e=-e):c.copy(b);if(1<=Math.abs(e))return c.w=a.w,c.x=a.x,c.y=a.y,c.z=a.z,c;var b=Math.acos(e),f=Math.sqrt(1-e*e);if(0.001>Math.abs(f))return c.w=0.5*(a.w+c.w),c.x=0.5*(a.x+c.x),c.y=0.5*(a.y+c.y),c.z=0.5*(a.z+c.z),c;e=Math.sin((1-d)*b)/f;d=Math.sin(d*b)/f;c.w=a.w*e+c.w*d;c.x=a.x*e+c.x*d;c.y=a.y*e+c.y*d;c.z=a.z*e+c.z*d;return c}; 
    100 THREE.Vertex=function(a){console.warn("THREE.Vertex has been DEPRECATED. Use THREE.Vector3 instead.");return a};THREE.Face3=function(a,b,c,d,e,f){this.a=a;this.b=b;this.c=c;this.normal=d instanceof THREE.Vector3?d:new THREE.Vector3;this.vertexNormals=d instanceof Array?d:[];this.color=e instanceof THREE.Color?e:new THREE.Color;this.vertexColors=e instanceof Array?e:[];this.vertexTangents=[];this.materialIndex=f;this.centroid=new THREE.Vector3}; 
     100THREE.Vertex=function(a){console.warn("THREE.Vertex has been OBSOLETE. Use THREE.Vector3 instead.");return a};THREE.Face3=function(a,b,c,d,e,f){this.a=a;this.b=b;this.c=c;this.normal=d instanceof THREE.Vector3?d:new THREE.Vector3;this.vertexNormals=d instanceof Array?d:[];this.color=e instanceof THREE.Color?e:new THREE.Color;this.vertexColors=e instanceof Array?e:[];this.vertexTangents=[];this.materialIndex=f;this.centroid=new THREE.Vector3}; 
    101101THREE.Face3.prototype={constructor:THREE.Face3,clone:function(){var a=new THREE.Face3(this.a,this.b,this.c);a.normal.copy(this.normal);a.color.copy(this.color);a.centroid.copy(this.centroid);a.materialIndex=this.materialIndex;var b,c;b=0;for(c=this.vertexNormals.length;b<c;b++)a.vertexNormals[b]=this.vertexNormals[b].clone();b=0;for(c=this.vertexColors.length;b<c;b++)a.vertexColors[b]=this.vertexColors[b].clone();b=0;for(c=this.vertexTangents.length;b<c;b++)a.vertexTangents[b]=this.vertexTangents[b].clone(); 
    102102return a}};THREE.Face4=function(a,b,c,d,e,f,g){this.a=a;this.b=b;this.c=c;this.d=d;this.normal=e instanceof THREE.Vector3?e:new THREE.Vector3;this.vertexNormals=e instanceof Array?e:[];this.color=f instanceof THREE.Color?f:new THREE.Color;this.vertexColors=f instanceof Array?f:[];this.vertexTangents=[];this.materialIndex=g;this.centroid=new THREE.Vector3}; 
  • trunk/openPLM/plmapp/models/history.py

    r2608 r2612  
    223223 
    224224                set if :meth:`.PLMObject.is_official` returns True 
    225             .. attribute:: DEPRECATED 
     225            .. attribute:: OBSOLETE 
    226226 
    227227                set if :meth:`.PLMObject.is_obsolete` returns True 
     
    235235        app_label = "plmapp" 
    236236 
    237     DRAFT, PROPOSED, OFFICIAL, DEPRECATED, CANCELLED = range(5) 
     237    DRAFT, PROPOSED, OFFICIAL, OBSOLETE, CANCELLED = range(5) 
    238238    STATE_CATEGORIES = ( 
    239239        (DRAFT, "draft"), 
    240240        (PROPOSED, "proposed"), 
    241241        (OFFICIAL, "official"), 
    242         (DEPRECATED, "obsolete"), 
     242        (OBSOLETE, "obsolete"), 
    243243        (CANCELLED, "cancelled") 
    244244    ) 
     
    262262            category = StateHistory.DRAFT 
    263263        elif self.state == self.lifecycle.last_state: 
    264             category = StateHistory.DEPRECATED 
     264            category = StateHistory.OBSOLETE 
    265265        else: 
    266266            category = StateHistory.PROPOSED 
  • trunk/openPLM/settings.py

    r2608 r2612  
    2323DATABASES = { 
    2424    'default': { 
    25         'ENGINE': 'django.db.backends.sqlite3', # or 'postgresql', 'mysql', 'sqlite3', 'oracle'. 
    26         'NAME': os.path.join(PROJECT_ROOT, 'openplm.db'),               # Or path to database file if using sqlite3. 
     25        'ENGINE': 'django.db.backends.postgresql_psycopg2', # or 'postgresql', 'mysql', 'sqlite3', 'oracle'. 
     26        'NAME': 'openplm',               # Or path to database file if using sqlite3. 
    2727        'USER': 'django',                # Not used with sqlite3. 
    2828        #XYZ: should be the password set by the postgresql command 
     
    227227#XYZ: you will have to change this password 
    228228# it must be the same as the one set by the command ``rabbitmqctl add_user openplm 'secret'`` 
    229 BROKER_PASSWORD = "openplm" 
     229BROKER_PASSWORD = "secret" 
    230230BROKER_VHOST = "openplm" 
    231231 
     
    254254 
    255255# change this setting if you use an other user documentation for OpenPLM 
    256 DOCUMENTATION_URL = "http://wiki.openplm.org/docs/user/" 
     256DOCUMENTATION_URL = "http://www.openplm.org/docs/user/" 
Note: See TracChangeset for help on using the changeset viewer.