From bfcd31c7c14519d29cf5b2c813899fc63bc5cf32 Mon Sep 17 00:00:00 2001 From: anjalijaiswal08 Date: Tue, 25 Jun 2019 15:38:20 +0530 Subject: Uploading Subcircuit feature added --- src/projManagement/Validation.py | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'src/projManagement') diff --git a/src/projManagement/Validation.py b/src/projManagement/Validation.py index 65103282..a3b12ecd 100644 --- a/src/projManagement/Validation.py +++ b/src/projManagement/Validation.py @@ -186,3 +186,48 @@ class Validation: Example, nghdl, eeschema... """ return distutils.spawn.find_executable(toolName) is not None + + def validateSubcir(self, projDir): + """ + This function checks for valid format of .sub file. + Correct format of file is: + - File should start with **.subckt ** + - End with **.ends ** + Function is passed with the file of path it checks the + file line by line untill it get .subckt as its first word + and then check for second word is it or not. + + Then it checks for second last line if it is ".ends + " it return True if conditions satisfy else + return False. + + """ + projName = os.path.basename(str(projDir)) + fileName = projName[:-4] + req_line = ".ends" + " " + str(fileName) + f = open(projDir, 'r') + + flag1 = False + flag2 = False + + for line in f: + word = line.split(' ') + if word[0] == "*": + continue + if word[0] == ".subckt": + break + + if word[1] == fileName: + flag1 = True + + with open(projDir, 'r') as m: + lines = m.read().splitlines() + last_line = lines[-2] + + if req_line == last_line: + flag2 = True + + if flag1 == True and flag2 == True: + return "True" + else: + return "False" -- cgit From 24148f36807eb1c5dbe6a6edb623e58313521534 Mon Sep 17 00:00:00 2001 From: anjalijaiswal08 Date: Thu, 27 Jun 2019 01:01:46 +0530 Subject: changes need to be commited --- src/projManagement/Validation.py | 136 +++++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 63 deletions(-) (limited to 'src/projManagement') diff --git a/src/projManagement/Validation.py b/src/projManagement/Validation.py index a3b12ecd..ebaea625 100644 --- a/src/projManagement/Validation.py +++ b/src/projManagement/Validation.py @@ -1,4 +1,3 @@ - # ========================================================================= # # FILE: Validation.py @@ -21,12 +20,25 @@ import os import re import distutils.spawn +""" +This is Validation class use for validating Project. +e.g if .proj is present in project directory +or if new project name is already exist in workspace etc +""" + class Validation: """ - This is Validation class use for validating Project. - e.g if .proj is present in project directory - or if new project name is already exist in workspace etc + Takes as input the path of the project and checks if + projName.proj file exists + projName is same as the folder selected + + @params + :projDir => contains the path of the project folder selected to open + + @return + True => If the folder contains the projName.proj file + False => If the folder doesn't contain projName.proj file """ def __init__(self): @@ -34,17 +46,7 @@ class Validation: def validateOpenproj(self, projDir): """ - Takes as input the path of the project and checks if - projName.proj file exists - projName is same as the folder selected - - @params - :projDir => contains the path of the project folder selected\ - to open - - @return - True => If the folder contains the projName.proj file - False => If the folder doesn't contain projName.proj file + This function validate Open Project Information. """ print("Function: Validating Open Project Information") projName = os.path.basename(str(projDir)) @@ -55,17 +57,21 @@ class Validation: else: return False - def validateNewproj(self, projDir): - """ - Validate new project created + """ + Validate new project created - @params - :projDir => Contains path of the new projDir created + @params + :projDir => Contains path of the new projDir created - @return - :"CHECKEXIST" => If smae project name folder exists - :"CHECKNAME" => If space is there in name - :"VALID" => If valid project name given + @return + :"CHECKEXIST" => If smae project name folder exists + :"CHECKNAME" => If space is there in name + :"VALID" => If valid project name given + """ + + def validateNewproj(self, projDir): + """ + This Project Validate New Project Information """ print("Function: Validating New Project Information") @@ -79,18 +85,22 @@ class Validation: else: return "VALID" - def validateKicad(self, projDir): - """ - Validate if projDir is set appropriately in the function calling file - and if Kicad components are present + """ + Validate if projDir is set appropriately in the function calling file + and if Kicad components are present - @params - :projDir => the path of the project directory, passed from - the calling function + @params + :projDir => the path of the project directory, passed from + the calling function - @return - True - False + @return + True + False + """ + + def validateKicad(self, projDir): + """ + This function validate if Kicad components are present """ print("FUnction : Validating for Kicad components") if projDir is None: @@ -98,17 +108,21 @@ class Validation: else: return True - def validateCir(self, projDir): - """ - Validate if cir file present in the directory with the appropriate .cir - file name, same as the project directory base + """ + Validate if cir file present in the directory with the appropriate .cir + file name, same as the project directory base - @params - :projDir => the path to the project directory + @params + :projDir => the path to the project diretory - @return - True - False + @return + True + False + """ + + def validateCir(self, projDir): + """ + This function checks if ".cir" file is present. """ projName = os.path.basename(str(projDir)) lookCir = os.path.join(str(projDir), projName + ".cir") @@ -161,17 +175,7 @@ class Validation: return "DIREC" def validateCirOut(self, projDir): - """ - This function checks if ".cir.out" file is present. - - @params - :projDir => the path of the project directory, passed from - the calling function - - @return - True - False - """ + """This function checks if ".cir.out" file is present.""" projName = os.path.basename(str(projDir)) lookCirOut = os.path.join(str(projDir), projName + ".cir.out") # Check existence of project @@ -181,10 +185,7 @@ class Validation: return False def validateTool(self, toolName): - """ - This function check if tool is present in the system, - Example, nghdl, eeschema... - """ + """This function check if tool is present in the system.""" return distutils.spawn.find_executable(toolName) is not None def validateSubcir(self, projDir): @@ -210,15 +211,24 @@ class Validation: flag1 = False flag2 = False + # Checks if file is empty or not. + if os.stat(projDir).st_size == 0: + print("File is empty") + print("===================") + return False + for line in f: word = line.split(' ') if word[0] == "*": continue if word[0] == ".subckt": + word = line.split(' ') break - if word[1] == fileName: + if word[0] == ".subckt" and word[1] == fileName: flag1 = True + else: + return False with open(projDir, 'r') as m: lines = m.read().splitlines() @@ -227,7 +237,7 @@ class Validation: if req_line == last_line: flag2 = True - if flag1 == True and flag2 == True: - return "True" - else: - return "False" + if flag1 is True and flag2 is True: + return True + + return False -- cgit From b6effcc4c38520de2459f428dd4c5dae1e76f71f Mon Sep 17 00:00:00 2001 From: anjalijaiswal08 Date: Thu, 27 Jun 2019 10:52:26 +0530 Subject: done --- src/projManagement/Validation.py | 46 +++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'src/projManagement') diff --git a/src/projManagement/Validation.py b/src/projManagement/Validation.py index ebaea625..d270da6e 100644 --- a/src/projManagement/Validation.py +++ b/src/projManagement/Validation.py @@ -28,6 +28,7 @@ or if new project name is already exist in workspace etc class Validation: + """ Takes as input the path of the project and checks if projName.proj file exists @@ -205,11 +206,9 @@ class Validation: """ projName = os.path.basename(str(projDir)) fileName = projName[:-4] - req_line = ".ends" + " " + str(fileName) - f = open(projDir, 'r') - flag1 = False - flag2 = False + first = True + last_line = [] # Checks if file is empty or not. if os.stat(projDir).st_size == 0: @@ -217,27 +216,30 @@ class Validation: print("===================") return False - for line in f: - word = line.split(' ') - if word[0] == "*": - continue - if word[0] == ".subckt": - word = line.split(' ') - break + with open(projDir, 'r') as f: + for line in f: + word = line.split() + if len(word) == 0 or word[0][0] == "*": + continue + # print(word) + # print(word[0], word[1]) + if first: + if word[0] == ".subckt" and word[1] == fileName: + first = False + else: + print("First line not found") + return False + else: + last_line = word - if word[0] == ".subckt" and word[1] == fileName: - flag1 = True - else: + if first is True: + print("First line not found") return False - with open(projDir, 'r') as m: - lines = m.read().splitlines() - last_line = lines[-2] - - if req_line == last_line: - flag2 = True - - if flag1 is True and flag2 is True: + print(last_line) + if len(last_line) >= 2 and last_line[0] == ".ends" and \ + last_line[1] == fileName: return True + print("Last line not found") return False -- cgit From 17e8d542ab9cb7c1c91fb2ef7c23ff8d556d4138 Mon Sep 17 00:00:00 2001 From: anjalijaiswal08 Date: Thu, 27 Jun 2019 11:02:57 +0530 Subject: uploading subcircuit done --- src/projManagement/Validation.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/projManagement') diff --git a/src/projManagement/Validation.py b/src/projManagement/Validation.py index d270da6e..f2d84314 100644 --- a/src/projManagement/Validation.py +++ b/src/projManagement/Validation.py @@ -28,7 +28,6 @@ or if new project name is already exist in workspace etc class Validation: - """ Takes as input the path of the project and checks if projName.proj file exists @@ -221,8 +220,6 @@ class Validation: word = line.split() if len(word) == 0 or word[0][0] == "*": continue - # print(word) - # print(word[0], word[1]) if first: if word[0] == ".subckt" and word[1] == fileName: first = False -- cgit