ABS/abscontrol Commit - r152:153 · Jicamarca Repository

- Finalizada la funcion que lee(importa) un archivo ABS sin guardarlo a la base de datos....

jsalyrosas -

r152:153

parent child

Context file:

r152:153

Collapse all files

trunk/webapp/abscontrol/models.py +8 -6

             from django.db import models
             from django.utils import timezone
   No newline at end of file
             class Profile(models.Model):
   No newline at end of file
                 name = models.CharField(max_length=250)
                 date_create = models.DateTimeField()
                 date_modified = models.DateTimeField(null=True)
                 hits = models.PositiveIntegerField()
                 state = models.PositiveSmallIntegerField()
   No newline at end of file
                 class Meta:
                     db_table = "abs_profile_antenna"
   No newline at end of file
                 def save(self):
                     if self.pk is None:
                         self.date_create = timezone.now()
                         self.hits = 0
                         self.state = 1
                     else:
                         self.date_modified = timezone.now()
                     super(Profile, self).save()
   No newline at end of file
                 def __unicode__(self):
                     return u'%s' % self.name
   No newline at end of file
             class Pattern(models.Model):
   No newline at end of file
                 profile = models.ForeignKey(Profile)
                 value = models.PositiveIntegerField()
                 date_create = models.DateTimeField()
                 date_modified = models.DateTimeField(null=True)
                 hits = models.PositiveIntegerField()
                 state = models.PositiveSmallIntegerField()
   No newline at end of file
                 class Meta:
                     db_table = "abs_pattern_antenna"
   No newline at end of file
                 def save(self, *args, **kwargs):
                     if not self.pk:
                         self.date_create = timezone.now()
                         self.hits = 0
                         self.state = 1
                     else:
                         self.date_modified = timezone.now()
                     super(Pattern, self).save(*args, **kwargs)
   No newline at end of file
                 def __unicode__(self):
                     return u'%s' % self.value
   No newline at end of file
   No newline at end of file
             class AntennaUp(models.Model):
   No newline at end of file
                 pattern = models.ForeignKey(Pattern)
                 value = models.TextField()
                 tx = models.TextField(null=True)
-                tx = models.TextField()
+             No newline at end of file
                 rx = models.TextField(null=True)
-                rx = models.TextField()
+             No newline at end of file
                 ues = models.CharField(max_length=120, null=True)
-                ues = models.CharField(max_length=120)
  No newline at end of file
+             No newline at end of file
+                only_rx = models.PositiveSmallIntegerField(default=0)
  No newline at end of file
                 date_create = models.DateTimeField()
                 date_modified = models.DateTimeField(null=True)
                 hits = models.PositiveIntegerField()
                 state = models.PositiveSmallIntegerField()
   No newline at end of file
                 class Meta:
                     db_table = "abs_antenna_up"
   No newline at end of file
                 def save(self, *args, **kwargs):
                     if self.pk is None:
                         self.date_create = timezone.now()
                         self.hits = 0
                         self.state = 1
                     else:
                         self.date_modified = timezone.now()
                     super(AntennaUp, self).save(*args, **kwargs)
   No newline at end of file
                 def __unicode__(self):
                     return u'%s' % self.value
   No newline at end of file
   No newline at end of file
             class AntennaDown(models.Model):
   No newline at end of file
                 pattern = models.ForeignKey(Pattern)
                 value = models.TextField()
                 tx = models.TextField(null=True)
-                tx = models.TextField()
+             No newline at end of file
                 rx = models.TextField(null=True)
-                rx = models.TextField()
+             No newline at end of file
                 ues = models.CharField(max_length=120, null=True)
-                ues = models.CharField(max_length=120)
  No newline at end of file
+             No newline at end of file
+                only_rx = models.PositiveSmallIntegerField(default=0)
  No newline at end of file
                 date_create = models.DateTimeField()
                 date_modified = models.DateTimeField(null=True)
                 hits = models.PositiveIntegerField()
                 state = models.PositiveSmallIntegerField()
   No newline at end of file
                 class Meta:
                     db_table = "abs_antenna_down"
   No newline at end of file
                 def save(self, *args, **kwargs):
                     if self.pk is None:
                         self.date_create = timezone.now()
                         self.hits = 0
                         self.state = 1
                     else:
                         self.date_modified = timezone.now()
                     super(AntennaDown, self).save(*args, **kwargs)
   No newline at end of file
                 def __unicode__(self):
                     return u'%s' % self.value

trunk/webapp/abscontrol/views.py 0 -17

             from django.shortcuts import render_to_response, redirect
             from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
             from util.readABSFile import readABSFile
   No newline at end of file
             txtAntenna = "[[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]]"
   No newline at end of file
             txtTxUp = "[[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]]"
   No newline at end of file
             txtTxDown = "[[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]]"
   No newline at end of file
             txtRxUp = "[[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]]"
   No newline at end of file
             txtRxDown = "[[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]]"
   No newline at end of file
             txtUes = "[0.533333,0.00000,1.06667,0.00000]"
   No newline at end of file
             def index(request):
                 #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
                 profile_list = Profile.objects.all()
                 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
   No newline at end of file
             def new(request):
                 profile_list = Profile.objects.all()
   No newline at end of file
                 return render_to_response('abscontrol/new.html', {'profile_list': profile_list,
                                                                   'txtAntenna' : txtAntenna,
                                                                   'txtUes' : txtUes, 'txtTxUp' : txtTxUp,
                                                                   'txtTxDown' : txtTxDown, 'txtRxUp' : txtRxUp,
                                                                   'txtRxDown' : txtRxDown,
                                                                   })
   No newline at end of file
             def save(request):
   No newline at end of file
                 txtProfile = request.POST["txtProfile"]
   No newline at end of file
                 txtAntennaUp = request.POST["txtAntennaUp"]
                 txtTxUp = request.POST["txtTxUp"]
                 txtRxUp = request.POST["txtRxUp"]
                 txtUesUp = request.POST["txtUesUp"]
   No newline at end of file
                 txtAntennaDown = request.POST["txtAntennaDown"]
                 txtTxDown = request.POST["txtTxDown"]
                 txtRxDown = request.POST["txtRxDown"]
                 txtUesDown = request.POST["txtUesDown"]
   No newline at end of file
                 newprofile = Profile(name=txtProfile)
                 newprofile.save()
   No newline at end of file
                 newpattern = newprofile.pattern_set.create(value=1)
                 newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
                 newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
   No newline at end of file
                 newurl = '/abscontrol/view/%d' % newprofile.id
   No newline at end of file
                 return redirect(newurl)
   No newline at end of file
             def view(request, profile_id):
                 nextPattern = 0
   No newline at end of file
                 if request.method == 'GET' and 'pattern' in request.GET:
                     pattern_value = request.GET["pattern"]
                 else:
                     pattern_value = 1
   No newline at end of file
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
   No newline at end of file
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 if len(lsPatterns) > 1:
                     if pattern_value == 1:
                         nextValuePattern = pattern_value + 1
                         nextPattern = objProfile.pattern_set.get(value=nextValuePattern)
   No newline at end of file
   No newline at end of file
                 return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    'nextPattern' : nextPattern,
                                                                    })
   No newline at end of file
             def edit(request, profile_id):
                 if request.method == 'GET' and 'pattern' in request.GET:
                     pattern_value = request.GET["pattern"]
                 else:
                     pattern_value = 1
   No newline at end of file
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
   No newline at end of file
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 return render_to_response('abscontrol/edit.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    })
   No newline at end of file
             def addPattern(request, profile_id):
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
   No newline at end of file
                 return render_to_response('abscontrol/addPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                          'txtAntenna' : txtAntenna, 'txtUes' : txtUes,
                                                                          'txtTxUp' : txtTxUp, 'txtTxDown' : txtTxDown,
                                                                          'txtRxUp' : txtRxUp, 'txtRxDown' : txtRxDown,
                                                                          })
   No newline at end of file
             def editPattern(request, profile_id, pattern_id):
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = Pattern.objects.get(pk=pattern_id)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 return render_to_response('abscontrol/editPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           })
   No newline at end of file
             def savePattern(request, profile_id):
                 pattern_id = 0
                 method = "save"
   No newline at end of file
                 if 'pattern_id' in request.POST:
                     pattern_id = request.POST["pattern_id"]
                     method = "update"
   No newline at end of file
                 maxValuePattern = 0
                 txtAntennaUp = request.POST["txtAntennaUp"]
                 txtTxUp = request.POST["txtTxUp"]
                 txtRxUp = request.POST["txtRxUp"]
                 txtUesUp = request.POST["txtUesUp"]
   No newline at end of file
                 txtAntennaDown = request.POST["txtAntennaDown"]
                 txtTxDown = request.POST["txtTxDown"]
                 txtRxDown = request.POST["txtRxDown"]
                 txtUesDown = request.POST["txtUesDown"]
   No newline at end of file
                 if method == "save":
                     objProfile = Profile.objects.get(pk=profile_id)
                     lsPatterns = objProfile.pattern_set.all()
                     for element in lsPatterns:
                         if element.value > maxValuePattern:
                             maxPattern = element.value
   No newline at end of file
                     if maxPattern < 10 :
                         newValuePattern = maxPattern + 1
                         newpattern = objProfile.pattern_set.create(value=newValuePattern)
                         newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
                         newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
   No newline at end of file
                         newurl = '/abscontrol/%d/view/%d' % (int(profile_id), newpattern.id)
                     else:
                         newurl = '/abscontrol/edit/%d' % (int(profile_id))
                 else:
                     txtAntennaUpId = request.POST["txtAntennaUpId"]
                     objAntennaUp = AntennaUp.objects.get(pk=txtAntennaUpId)
                     objAntennaUp.value = txtAntennaUp
                     objAntennaUp.tx = txtTxUp
                     objAntennaUp.rx = txtRxUp
                     objAntennaUp.ues = txtUesUp
                     objAntennaUp.save()
   No newline at end of file
                     txtAntennaDownId = request.POST["txtAntennaDownId"]
                     objAntennaDown = AntennaDown.objects.get(pk=txtAntennaDownId)
                     objAntennaDown.value = txtAntennaDown
                     objAntennaDown.tx = txtTxDown
                     objAntennaDown.rx = txtRxDown
                     objAntennaDown.ues = txtUesDown
                     objAntennaDown.save()
   No newline at end of file
                     newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
   No newline at end of file
                 return redirect(newurl)
   No newline at end of file
             def viewPattern(request, profile_id, pattern_id):
   No newline at end of file
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
   No newline at end of file
                 patternChoosen = Pattern.objects.get(pk=pattern_id)
   No newline at end of file
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 lsPatterns = objProfile.pattern_set.all()
   No newline at end of file
                 return render_to_response('abscontrol/viewPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           })
   No newline at end of file
             def deletePattern(request, profile_id, pattern_id):
                 newurl = '/abscontrol/edit/%d' % int(profile_id)
   No newline at end of file
                 return redirect(newurl)
   No newline at end of file
             def importProfile(request):
   No newline at end of file
                 return render_to_response('abscontrol/import.html', { })
   No newline at end of file
             def saveImport(request):
                 if request.method == 'POST':
                     txtFilename = request.FILES['txtFile']
                     if txtFilename:
                         destination = open('/tmp/'+txtFilename.name, 'wb+')
                         for chunk in txtFilename.chunks():
                             destination.write(chunk)
                         destination.close()
                         filename = '/tmp/'+txtFilename.name
                         readFile = readABSFile(filename)
                         expName, num_patterns, patterns = readFile.getMetadata()
              No newline at end of file
              No newline at end of file
-                        '''
              No newline at end of file
-                        f = open('/tmp/'+txtFilename.name, 'r')
              No newline at end of file
-                        newContent = f.readlines()
              No newline at end of file
-                        f.close()
              No newline at end of file
-                        content = ""
              No newline at end of file
-                        for i,line in enumerate(newContent):
              No newline at end of file
-                            if i == 0:
              No newline at end of file
-                                newLine = line.replace("'","")
              No newline at end of file
-                                pos = newLine.find("=")
              No newline at end of file
-                                expName = newLine[pos+1:].strip()
              No newline at end of file
-                            elif i == 2:
              No newline at end of file
-                                pos = line.find("=")
              No newline at end of file
-                                num_patterns = line[pos+1:].strip()
              No newline at end of file
-                            else:
              No newline at end of file
-                                content += line
              No newline at end of file
-                        '''
  No newline at end of file
                 else:
                     txtFilename = "Error"
                     #content = "Error"
                     expName = ""
                     num_patterns = 0
   No newline at end of file
                 return render_to_response('abscontrol/upload.html', {'txtFilename': txtFilename, 'patterns' : patterns,
                                                                      'expName' : expName, 'num_patterns' : num_patterns,
                                                                      })
   No newline at end of file

trunk/webapp/static/css/style.css +10 -6

             /*
              * font-family: 'Droid Sans', sans-serif;
              * font-family: 'Ubuntu', sans-serif;
              * font-family: 'Open Sans', sans-serif;
              * font-family: 'Open Sans Condensed', sans-serif;
              * font-family: 'Roboto Condensed', sans-serif;
              */
             body { font-size: 12px; }
  No newline at end of file
-            body { font-size: 11px; }
  No newline at end of file
             header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
             #schema {margin: 0 auto; width: 980px; border: 1px solid #f00; padding: 10px 10px 10px 10px}
             #content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
             #content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; }
             #content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;}
             footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
   No newline at end of file
             .cleardivs {clear: both; border: 0px solid #400; height: 0px}
             /****************************************************************************************/
             /******                     ESTILOS GENERALES                           *****************/
             /****************************************************************************************/
             .mnu{ height: 22px; border: 0px solid #c55 !important;}
             .mnu li{ display:inline;}
             .MnuVertical, .MnuHorizontal { font-family: 'Droid Sans', sans-serif; font-size: 1.2em; font-style: italic; text-shadow: 2px 2px #eee}
             .MnuHorizontal ul{ list-style: none; list-style-type: none; margin: 0;}
   No newline at end of file
             /*.MnuHorizontal{ display: -webkit-box; -webkit-box-orient:horizontal;}*/
             /*.MnuHorizontal a{ display:block; padding:10px; -webkit-box-flex:1; text-align:center; }*/
   No newline at end of file
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PERFILES **********************************/
             /****************************************************************************************/
             #content #infoProfiles {border: 1px solid #d00 !important; width: 140px; margin: 0px; padding-top: 2px; padding-bottom: 2px}
             .lblInfo {padding-left: 12px; line-height: 20px;}
             #infoProfiles select {padding-left: 12px; line-height: 20px;margin-left: 12px}
             #content nav {border: 0px solid #c55 !important; margin: 0px;}
   No newline at end of file
             #leftcolumn #mnuProfiles{ margin: 5px 0px; border: 0px solid #1494F6 !important; }
             #mnuProfiles ul{list-style: none; list-style-type: none; margin: 0; padding-left: 20px; border: 0px solid #f00 !important}
             #mnuProfiles li{ width: 80px; padding: 2px; border: 0px solid #c55 !important; line-height: 22px}
             #mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: left}
   No newline at end of file
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile { border: 0px solid #dff; margin: 10px 0px; padding: 10px 10px; width: 500px }
             .flsAntenna { margin: 10px 0px; width: 750px; padding: 10px 10px }
             #divPattern textarea,input[type=text],label{ font-family: "Open Sans"; font-size: inherit; }
  No newline at end of file
-            #divPattern textarea,input[type=text],label{ font-family: Monaco; font-size: inherit; }
  No newline at end of file
   No newline at end of file
             #divPattern textarea {resize: none; overflow: hidden}
   No newline at end of file
             .divAntenna { float: left; margin: 10px; height: 160px; border: 0px solid #fcc !important; width: 260px }
             .divAntenna label{ display: block }
             .txtAntenna { width: 250px; max-width: 250px; height: 135px; max-height: 140px; }
-            .txtAntenna { max-width: 250px; max-height: 125px; width: 250px; height: 125px }
+             No newline at end of file
             .divAntenna p{ width: 250px; max-width: 250px; height: 130px; max-height: 130px; border: 1px solid #eee !important}
  No newline at end of file
-            .divAntenna p{ max-width: 250px; max-height: 125px; width: 250px; height: 125px }
  No newline at end of file
   No newline at end of file
             .divTx { display: block; float: left; margin: 10px; height: 150px }
             .divTx label{ display: block }
             .divTx textarea{ width: 135px; max-width: 135px; height: 135px; max-height: 140px; text-align: justify }
-            .divTx textarea{ width: 135px; max-width: 135px; height: 125px; max-height: 125px; text-align: justify }
+             No newline at end of file
             .divTx p{ width: 135px; max-width: 135px; height: 130px; max-height: 130px; text-align: justify }
  No newline at end of file
-            .divTx p{ width: 135px; max-width: 135px; height: 125px; max-height: 125px; text-align: justify }
  No newline at end of file
   No newline at end of file
             .divUes { display: block; margin: 10px}
             .divUes input[type=text] { width: 240px; max-width: 240px;}
   No newline at end of file
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PATRONES **********************************/
             /****************************************************************************************/
             #divMnuPattern{ width: 280px; height: 25px; display: block; border: 0px solid #1cc !important; float: left; margin-left: 500px}
             #divMnuPattern li{ float: left; display: block; width: 60px; border: 0px solid #2cc !important}
             #divMnuPattern a{ display: block; line-height: 22px; text-decoration: none; padding: 0px 5px;
                               border-bottom: 1px solid #1494F6 !important; margin: 0px 2px; text-align: center; color: #1494F6
                             }
             #infoPattern{ display: block; border: 1px solid #1494f6 !important, margin: 5px 2px; }
   No newline at end of file
             #navPatterns{ margin: 10px auto; border: 0px solid #d00 !important; width: 500px; height: 30px; font-family: 'Ubuntu', sans-serif; font-size: 14px;
                           padding: 10px 0px}
             #navPatternList{ margin: 0px auto; border: 1px solid #ecc !important}
             #navPatternList ul{ list-style: none; list-style-type: none; margin: 0;}
             #navPatternList ul li{ float: left; width: 50px; border: 1px solid #eee !important; }
             #navPatternList a{ width: 50px; border: 0px solid #1cc !important; display: block; text-align: center; line-height: 25px}
             .lnkPattern{ background-color: #ccc !important; color: #eee;}
             .lnkPatternSelected{ background-color: #2cc !important; color: #fff;}
              No newline at end of file
+            .divListofPatterns{ width: 650px; display: block; border: 1px solid #1cc !important; margin: 0 auto}
              No newline at end of file
+            .divPattern{ width: 600px; display: block; border: 1px solid #f00 !important; margin: 2px auto; }
              No newline at end of file
+  No newline at end of file

trunk/webapp/templates/abscontrol/upload.html +10 -9

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::::IMPORT PROFILE{% endblock %}
   No newline at end of file
             {% block content %}
             <div id="content">
                 <div id="divPattern">
                     <div class="divUes">
                         <label for="lblFile">File: {{ txtFilename }}</label>
  No newline at end of file
-                        <label for="lblFile">File:</label>
              No newline at end of file
-                        <label for="lblFilename">{{ txtFilename }}</label>
  No newline at end of file
                     </div>
                     <div class="divUes">
                         <label for="lblExperiment">Experiment: {{ expName }}</label><br />
-                        <label for="lblExperiment">Experiment:</label>
+             No newline at end of file
                         <label for="lblNumber">Number of patterns: {{ num_patterns }}</label>
  No newline at end of file
-                        <p>{{ expName }}</p>
              No newline at end of file
-                        <label for="lblNumber">Number of patterns:</label>
              No newline at end of file
-                        <p>{{ num_patterns }}</p>
  No newline at end of file
                     </div>
                     {% if patterns %}
                     <div class="divListofPatterns">
  No newline at end of file
-                    <div>
  No newline at end of file
                         {% for element in patterns %}
+                        <div class="divPattern">
  No newline at end of file
                             <div>
                                 <label for="lblNumber">Pattern: {{ element.number }}</label>
                             </div>
                             <div class="divAntenna">
  No newline at end of file
-                        <div>
  No newline at end of file
                                 <label for="lblAntennaUp">Antenna Up:</label>
                                 <p>{{ element.up }}</p>
                             </div>
                             <div class="divAntenna">
  No newline at end of file
-                        <div>
  No newline at end of file
                                 <label for="lblAntennaDown">Antenna Down:</label>
                                 <p>{{ element.down }}</p>
                             </div>
+                            <div class="cleardivs"></div>
              No newline at end of file
+                        </div>
              No newline at end of file
+                        <div class="cleardivs"></div>
  No newline at end of file
                         {% endfor %}
                     </div>
                     {% endif %}
                 </div>
             </div>
             {% endblock %}

trunk/webapp/util/readABSFile.py +28 -8

             '''
             Created on May 2, 2013
   No newline at end of file
             @author: Jose Antonio Sal y Rosas Celi
             @contact: jose.salyrosas@jro.igp.gob.pe
             '''
   No newline at end of file
             class readABSFile(object):
   No newline at end of file
                 __scriptName = "readABSFile.py"
   No newline at end of file
                 def __init__(self, filename):
                     self.fileName = filename
                     self.content = ""
                     self.exp_name = ""
                     self.number_patterns = 0
                     self.patterns = {}
   No newline at end of file
                 def readFile(self):
                     f = open(self.fileName, 'r')
                     self.content = f.readlines()
                     f.close()
   No newline at end of file
                 def getMetadata(self):
                     self.readFile()
   No newline at end of file
                     newLine = self.content[0].replace("'","")
                     pos = newLine.find("=")
                     self.exp_name = newLine[pos+1:].strip()
   No newline at end of file
                     pos = self.content[2].find("=")
                     self.number_patterns = int(self.content[2][pos+1:].strip())
   No newline at end of file
                     self.patterns = self.getPatterns(self.content[3:])
   No newline at end of file
                     return self.exp_name, self.number_patterns, self.patterns
   No newline at end of file
                 def getPatterns(self, content):
                     lsPattern = []
                     patterns = self.getValueofPattern(content)
-                    index = 8
+             No newline at end of file
                     for element in patterns:
              No newline at end of file
                         if element != "":
-                    for i in range(0, self.number_patterns):
+             No newline at end of file
                             strValue = element.replace("=","/")
-                        first = i+index
+             No newline at end of file
                             pattern = strValue.split("/")
-                        second = first+index
+             No newline at end of file
                             dicPattern = {"number" : pattern[0], "up" : pattern[1], "down" : pattern[2]}
  No newline at end of file
-                        antennaUp = content[i:first]
              No newline at end of file
-                        antennaDown = content[first+1:second]
              No newline at end of file
-                        dicPattern = {"number" : content[i], "up" : antennaUp, "down" : antennaDown}
  No newline at end of file
                             lsPattern.append(dicPattern)
   No newline at end of file
                     return lsPattern
              No newline at end of file
+                def getValueofPattern(self, content):
              No newline at end of file
+                    strValue = "".join(element.replace("\n","+").strip() for element in content)
              No newline at end of file
+                    strValue = strValue.replace("\r","+")
              No newline at end of file
+                    strValue = strValue.replace("$","")
              No newline at end of file
+                    strValue = strValue.replace("]]+++[[","]]/[[")
              No newline at end of file
+                    strValue = strValue.replace("]]++[[","]]/[[")
              No newline at end of file
+                    strValue = strValue.replace("]]+[[","]]/[[")
              No newline at end of file
+                    strValue = strValue.replace("],++[","],[")
              No newline at end of file
+                    strValue = strValue.replace("],+[","],[")
              No newline at end of file
+                    strValue = strValue.replace("]]+++","]]|")
              No newline at end of file
+                    strValue = strValue.replace("]]++","]]|")
              No newline at end of file
+                    strValue = strValue.replace("]]+","]]|")
              No newline at end of file
+                    strValue = strValue.replace(" =++[[","=[[")
              No newline at end of file
+                    strValue = strValue.replace("=++[[","=[[")
              No newline at end of file
+                    strValue = strValue.replace(" =+[[","=[[")
              No newline at end of file
+                    strValue = strValue.replace("=+[[","=[[")
              No newline at end of file
+                    strValue = strValue.replace("+","").strip()
              No newline at end of file
+                    #print strValue
              No newline at end of file
+                    lsPatterns = strValue.split("|")
              No newline at end of file
              No newline at end of file
+                    return lsPatterns
  No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages