Changeset 668 in main for branches

Timestamp:

01/19/12 11:42:12 (8 years ago)

Author:

agalech

Message:

 

Location:

branches/3D/openPLM

Files:

• document3D/STP_converter_WebGL.py (modified) (1 diff)
• document3D/aficher.py (modified) (2 diffs)
• document3D/composer.py (modified) (1 diff)
• document3D/models.py (modified) (2 diffs)
• document3D/tests.py (modified) (2 diffs)
• plmapp/tests/archive.py (modified) (1 diff)
• runserver.sh (modified) (1 diff)

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

@@ -67 +67 @@
         
     def read_file(self,doc_file):      
-        STEPReader = STEPCAFControl_Reader()
-        STEPReader.ReadFile(self.filename)  
+        STEPReader = STEPCAFControl_Reader()        
+        
+        if not STEPReader.ReadFile(self.filename) is 1:
+            return False
+               
         h_doc = TDocStd.Handle_TDocStd_Document()
         app = XCAFApp.GetApplication().GetObject()

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

@@ -11 +11 @@
 from OCC.TDF import *
 
-import time
+
 #importante, voy a eliminar tmb los shapes referenciados, es esto u problema?
 #hqcer unq pruebq q mqno pqrq verificqrlo
@@ -20 +20 @@
     my_step_importer = NEW_STEP_Import(doc_file.file.path.encode())   #simple
     
-    my_step_importer.read_file(doc_file)
+    if not my_step_importer.read_file(doc_file.id):
+        print "\n\n\nMAl, el fichero leido no es valido\n\n\n" 
+        return False
 
 

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

@@ -10 +10 @@
     
     my_step_importer = NEW_STEP_Import(new_doc_file.file.path.encode())
-    my_step_importer.read_file()
+    my_step_importer.read_file(new_doc_file)
     st=my_step_importer.get_shapes_tool()
     lr= TDF_LabelSequence()

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

@@ -76 +76 @@
         self.nom = nom
         self.shape = shape
-        
-class part_reference(object):
-
-    __slots__ = ("nom", "loc", "quantity","labels")
-    
-    
-    def __init__(self, nom,location,step_ref):
-        self.nom = nom
-        self.loc = location
-        self.quantity=len(nom)
-        self.step_ref=step_ref
+
 
 #la referencia deberia ser un nombre de fichero o un docfile completo?
@@ -213 +203 @@
         
         
-            return True
+    return True
             
                            

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

@@ -28 +28 @@
         myfile = File(f)
         new_doc_file=self.document.add_file(myfile)
-        #print myfile.name
+
+
+        
+        
+    def test_add_false_STEP(self):
+        f=open("document3D/data_test/stp_false.stp")
+        myfile = File(f)
+        new_doc_file=self.document.add_file(myfile)
+        
+    def test_supression_STEP(self):
+        f=open("document3D/data_test/test.stp")
+        myfile = File(f)
+        new_doc_file=self.document.add_file(myfile)                
+        self.document.delete_file(new_doc_file)       
+
         
     ###############################################a hacer, comparar los jss generados### 
@@ -40 +54 @@
     """        
         
-        
+    ############################################# test check-in
+    
+    
+    ############################################# test check-out    
           
     

branches/3D/openPLM/plmapp/tests/archive.py

@@ -10 +10 @@
     def setUp(self):
         super(ArchiveViewTestCase, self).setUp()
-        self.document = DocumentController.create('doc1', 'Document',
+        self.document = Document3DController.create('doc1', 'Document',
                 'a', self.user, self.DATA)
         self.filenames = []

branches/3D/openPLM/runserver.sh

@@ -1 +1 @@
 #! /usr/bin/env sh
 ./manage.py celeryd -Q mails,index,celery,step -c 3 -l info &
-python -m smtpd -n -c DebuggingServer localhost:1025 &
+python -m smtpd -n -c DebuggingServer localhost:8085 &
 ./manage.py runserver
 exit 0