From e818ba5bcc461af545665c78157be4e52252aa1c Mon Sep 17 00:00:00 2001
From: Miha <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 11 Jul 2016 11:52:30 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng
---
python/trisurf/tsmgr.py | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/python/trisurf/tsmgr.py b/python/trisurf/tsmgr.py
index caff785..d973360 100644
--- a/python/trisurf/tsmgr.py
+++ b/python/trisurf/tsmgr.py
@@ -1,17 +1,21 @@
import argparse
import paramiko
from . import Remote
-from trisurf import trisurf
+from . import trisurf
import socket
-import sys
+import os,sys
import tabulate
import subprocess,re
import psutil
#import http.server
#import socketserver
-from urllib.parse import urlparse
-
-from . import WebTrisurf
+if sys.version_info>=(3,0):
+ from urllib.parse import urlparse
+ from . import WebTrisurf
+else:
+ from urlparse import urlparse
+ from vtk import *
+ from . import VTKRendering
#import io
@@ -40,6 +44,7 @@
action_group.add_argument('-s','--status',help='print status of the processes',action='store_true')
action_group.add_argument('-v','--version', help='print version information and exit', action='store_true')
action_group.add_argument('--web-server', type=int,metavar="PORT", nargs=1, help='EXPERIMENTAL: starts web server and never exist.')
+ action_group.add_argument('-p','--preview',help='preview last VTU shape',action='store_true')
parser.add_argument('--force', help='if dangerous operation (killing all the processes) is requested, this flag is required to execute the operation. Otherwise, the request will be ignored.', action="store_true")
parser.add_argument('-H', '--host', nargs=1, help='specifies which host is itended for the operation. Defauts to localhost for all operations except --status and --version, where all configured hosts are assumed.')
parser.add_argument('--html', help='Generate HTML output', action="store_true")
@@ -169,7 +174,10 @@
def start_web_server(args,host):
print('Server listening on port {}'.format(args['web_server'][0]))
- WebTrisurf.WebServer(port=args['web_server'][0])
+ if sys.version_info>=(3,0):
+ WebTrisurf.WebServer(port=args['web_server'][0])
+ else:
+ print("Cannot start WebServer in python 2.7")
exit(0)
def perform_action(args,host):
@@ -186,12 +194,21 @@
delete_comments(args,host)
elif args['web_server']!=None:
start_web_server(args,host)
+ elif args['preview']:
+ preview_vtu(args,host)
else: #version requested
print(getTrisurfVersion())
return
-
+
+def preview_vtu(args,host):
+ #only for localhost at the moment
+ if sys.version_info>=(3,0):
+ print("Preview works only with python 2.7")
+ exit(1)
+ if host['name'] == socket.gethostname():
+ VTKRendering.Renderer(args,host)
def getListOfHostConfigurationByHostname(hosts,host):
rhost=[]
--
Gitblit v1.9.3