From 8f3947b842eaa95cd9784cfcaeed45f5e4e701e7 Mon Sep 17 00:00:00 2001
From: rahulp13
Date: Wed, 29 Apr 2020 18:34:57 +0530
Subject: support for glob to load OM models
---
src/ngspicetoModelica/ModelicaUI.py | 30 +++++-------------------------
1 file changed, 5 insertions(+), 25 deletions(-)
(limited to 'src')
diff --git a/src/ngspicetoModelica/ModelicaUI.py b/src/ngspicetoModelica/ModelicaUI.py
index cd5cf03b..428bcab6 100644
--- a/src/ngspicetoModelica/ModelicaUI.py
+++ b/src/ngspicetoModelica/ModelicaUI.py
@@ -1,4 +1,5 @@
import os
+import glob
import traceback
from PyQt4 import QtGui, QtCore
from configuration.Appconfig import Appconfig
@@ -19,8 +20,7 @@ class OpenModelicaEditor(QtGui.QWidget):
self.projName = os.path.basename(self.projDir)
self.ngspiceNetlist = os.path.join(
self.projDir, self.projName + ".cir.out")
- self.modelicaNetlist = os.path.join(
- self.projDir, self.projName + ".mo")
+ self.modelicaNetlist = os.path.join(self.projDir, "*.mo")
self.map_json = Appconfig.modelica_map_json
self.grid = QtGui.QGridLayout()
@@ -96,28 +96,6 @@ class OpenModelicaEditor(QtGui.QWidget):
IfMOS = '1'
break
- subOptionInfo = []
- subSchemInfo = []
- if len(subcktName) > 0:
- # subOptionInfo = []
- # subSchemInfo = []
- for eachsub in subcktName:
- filename_temp = eachsub + '.sub'
- data = obj_NgMoConverter.readNetlist(filename_temp)
- # print "Data---------->",data
- subOptionInfo, subSchemInfo = (
- obj_NgMoConverter.separateNetlistInfo(data)
- )
- for eachline in subSchemInfo:
- # words = eachline.split()
- if eachline[0] == 'm':
- IfMOS = '1'
- break
- # print("Subcircuit OptionInfo :" +
- # "subOptionInfo------------------->", subOptionInfo)
- # print("Subcircuit Schematic Info :" +
- # "subSchemInfo-------------------->", subSchemInfo)
-
node, nodeDic, pinInit, pinProtectedInit = \
obj_NgMoConverter.nodeSeparate(
compInfo, '0', [], subcktName, []
@@ -233,7 +211,9 @@ class OpenModelicaEditor(QtGui.QWidget):
def callOMEdit(self):
if self.obj_validation.validateTool("OMEdit"):
- self.cmd2 = "OMEdit " + self.modelicaNetlist
+ modelFiles = glob.glob(self.modelicaNetlist)
+ modelFiles = ' '.join(file for file in modelFiles)
+ self.cmd2 = "OMEdit " + modelFiles
self.obj_workThread2 = Worker.WorkerThread(self.cmd2)
self.obj_workThread2.start()
print("OMEdit called")
--
cgit