Changeset 855 in main for branches

Timestamp:

03/07/12 15:11:00 (8 years ago)

Author:

agalech

Message:

Adding test 3D

Location:

branches/3D/openPLM/document3D

Files:

• STP_converter_WebGL.py (modified) (1 diff)
• composer.py (modified) (3 diffs)
• decomposer.py (modified) (1 diff)
• tests/views.py (modified) (4 diffs)

branches/3D/openPLM/document3D/STP_converter_WebGL.py

@@ -35 +35 @@
 from OCC.TopLoc import TopLoc_Location
 from OCC.TDF import *
-from openPLM.document3D.Mesh import *
+from openPLM.document3D.mesh import *
 from openPLM.document3D.models import *
 """

branches/3D/openPLM/document3D/composer.py

@@ -27 +27 @@
     st.GetFreeShapes(lr)
     
-    add_labels(product,lr.Value(1),st)   
+    add_labels(product,lr.Value(1),st)
+    print "Sale"   
 
     WS = XSControl_WorkSession()
@@ -35 +36 @@
     status = writer.Write(settings.MEDIA_ROOT+"Compuesto.stp")
     
-    print 'Finisehd mesh computation in %fs'%(time.time()-init_time)    
+   
     
 def add_labels(product,lr,st):
-
+#/home/linux/openPLM/branches/3D/openPLM/docs/stp/c818eb4e4353e4ceb5f250227ef2c6d2-rqssooy.stp
+#DocumentFile<53.8394.10.stp, Document<DOC_00082/Document3D/a>>
+#      ...    Step File Reading : /home/linux/openPLM/branches/3D/openPLM/docs/stp/c818eb4e4353e4ceb5f250227ef2c6d2-rqssooy.stp
 
     print "\n\n\nentra para product : " , product.name ,"\n\n\n"  
@@ -44 +47 @@
         if link.product.doc_id!= product.doc_id:
             q1=DocumentFile.objects.get(id=link.product.doc_id)
+            print q1
             my_step_importer = NEW_STEP_Import(q1)
-            
+            print "Sale 2"
             lr_2= TDF_LabelSequence()
+            print "Sale 2,5"
             my_step_importer.shape_tool.GetFreeShapes(lr_2)
-            add_labels(link.product,lr_2.Value(1),my_step_importer.shape_tool)                    
+            add_labels(link.product,lr_2.Value(1),my_step_importer.shape_tool)
+            print "sale 3"                    
             for d in range(link.quantity):
+                init_time = time.time()   
+                print "add : ",link.names[d]
                 new_label=st.AddComponent(lr,lr_2.Value(1),TopLoc_Location(link.locations[d].Transformation()))
                 SetLabelNom(new_label,link.names[d])
-                              
+                print 'Finisehd mesh computation of %s in %fs'%(link.names[d],(time.time()-init_time))                               
                 
     

branches/3D/openPLM/document3D/decomposer.py

@@ -33 +33 @@
 
 
-def get_decomposition_possibilities(arbre):
-
-    list=[]
-    for link in arbre[0].links: 
-        list.append(link)
-            
-    return list
 
 

branches/3D/openPLM/document3D/tests/views.py

@@ -22 +22 @@
         self.document = Document3DController.create('doc1', 'Document3D',
                 'a', self.user, self.DATA)
-        
+                
+    def update_time(self,data):
+        data.update({u'last_modif_time': [u'%s-%s-%s %s:%s:%s'%(self.document.mtime.year,self.document.mtime.month,self.document.mtime.day,self.document.mtime.hour,self.document.mtime.minute,self.document.mtime.second)],
+           u'last_modif_microseconds' : [u'%s'%self.document.mtime.microsecond]
+           })
+                   
     def test_3D_form(self):
         """
@@ -34 +39 @@
         self.assertEqual(response.context["select_stp_form"].as_table(), form.as_table())
 
-    
+    def test_view3D_stp_decompose(self):
+        f=open("document3D/data_test/test.stp")
+        myfile = File(f)
+        new_doc_file=self.document.add_file(myfile) 
+        self.controller.attach_to_document(self.document.object)                                                                   
+        data = data1
+        self.update_time(data)
+        self.post(self.base_url+"decompose/"+str(new_doc_file.id)+"/",data) 
+        response = self.get(self.document.object.plmobject_url+"3D/")        
+        self.assertEqual(len(response.context["file_geometry_js"]), 3)
+        #self.assertEqual(response.context["select_stp_form"].as_table(), form.as_table())    
             
     def test_3D_form_post(self):
@@ -47 +62 @@
         response_post = self.post(self.document.object.plmobject_url+"3D/", 
                             data)     
-        self.assertEqual(5, len(list(response_post.context["file_geometry_js"])))
+        self.assertEqual(5, len(response_post.context["file_geometry_js"]))
         self.assertNotEqual(response_post.context["javascript_arborescense"],False)        
                
@@ -233 +248 @@
         self.update_time(data)
         reponse_post = self.post(self.base_url+"decompose/"+str(new_doc_file.id)+"/",data)
-        self.assertEqual(reponse_post.context["extra_errors"],"documentfile is locked")
+        self.assertEqual(reponse_post.context["extra_errors"],"Documentfile is locked")