On 3/24/2013 3:02 AM, Thomas Holder wrote:
Dear PyMOL users,
The pre-release version of PyMOL 1.6 has been pushed to the open source
repository on SourceForge. Besides several minor fixes and improvements, this
version should complete the transition to shader-based rendering for all
on-screen drawing. For non-integrated chipsets this typically means higher
quality and quicker rendering.
Please also note that the URL of the SVN repository changed due to an upgrade
of the SourceForge website:
svn co svn://svn.code.sf.net/p/pymol/code/trunk/pymol
As always, we welcome bug reports and positive feedback.
Cheers,
- The PyMOL Team at Schrödinger
Hello,
Please consider the attached changes for building with msvc on Windows.
Also, the latest changes to vmdir.h don't compile with msvc.
<http://sourceforge.net/p/pymol/code/4025/tree//trunk/pymol/contrib/uiuc/plugins/molfile_plugin/src/vmddir.h?diff=50c0fc56e88f3d0bdf694277:4024>
Opening absolute paths does not work on Windows (e.g. C:\1bna.pdb):
Index: pymol/modules/pymol/internal.py
===================================================================
--- pymol/modules/pymol/internal.py (revision 4025)
+++ pymol/modules/pymol/internal.py (working copy)
@@ -303,7 +303,7 @@
try:
if not isinstance(finfo, basestring):
handle = finfo
- elif ':' in finfo:
+ elif '://' in finfo:
import urllib
handle = urllib.urlopen(finfo)
else:
The launch script, Scripts\pymol.bat, seems overly complicated and
doesn't always work for binary installers. Suggestion:
Index: pymol/setup.py
===================================================================
--- pymol/setup.py (revision 4025)
+++ pymol/setup.py (working copy)
@@ -119,9 +119,7 @@
with open(launch_script, 'w') as out:
if sys.platform.startswith('win'):
- out.write('set PYMOL_PATH=' + pymol_path + os.linesep)
- out.write('"%s" "%s"' % (python_exe, pymol_file))
- out.write(' %1 %2 %3 %4 %5 %6 %7 %8 %9' + os.linesep)
+ out.write(r'@%~dp0\..\pythonw.exe -m pymol.__init__ %*')
else:
out.write('#!/bin/sh' + os.linesep)
if sys.platform.startswith('darwin'):
Thanks,
Christoph
Index: pymol/layer0/os_predef.h
===================================================================
--- pymol/layer0/os_predef.h (revision 4025)
+++ pymol/layer0/os_predef.h (working copy)
@@ -109,6 +109,7 @@
#endif
#if defined(_WIN32) || defined(_WIN64)
+#define M_PI 3.1415926535897932384626433832795
#define fmax max
#define fmin min
#pragma warning (disable:4996)
Index: pymol/layer2/RepLabel.c
===================================================================
--- pymol/layer2/RepLabel.c (revision 4025)
+++ pymol/layer2/RepLabel.c (working copy)
@@ -90,12 +90,13 @@
}
} else if(G->HaveGUI && G->ValidContext) {
if(pick) {
+ Pickable *p;
+ int i;
if (I->shaderCGO){
CGORenderGLPicking(I->shaderCGO, pick, &I->R.context, I->R.cs->Setting,
I->R.obj->Setting);
return;
}
- Pickable *p = I->R.P;
- int i;
+ p = I->R.P;
SceneSetupGLPicking(G);
if(c) {
char *st;
Index: pymol/layer5/main.c
===================================================================
--- pymol/layer5/main.c (revision 4025)
+++ pymol/layer5/main.c (working copy)
@@ -23,7 +23,6 @@
#ifdef WIN32
#include <signal.h>
#include <tchar.h>
-#include <stdafx.h>
#endif
/* END PROPRIETARY CODE SEGMENT */
@@ -1792,9 +1791,8 @@
int main_exec(int argc, char **argv)
{
- is_shared = 0;
-
PyMOLGlobals *G = SingletonPyMOLGlobals;
+ is_shared = 0;
myArgc = argc;
myArgv = argv;
Index: pymol/modules/cealign/src/ccealignmodule.cpp
===================================================================
--- pymol/modules/cealign/src/ccealignmodule.cpp (revision 4025)
+++ pymol/modules/cealign/src/ccealignmodule.cpp (working copy)
@@ -631,11 +631,11 @@
int m = (int) v.dim1();
int n = (int) v.dim2();
- TA2<double> rVal(n,m);
+ TA2<double> rVal((int)n,(int)m);
for ( int i = 0; i < m; i++ )
for ( int j = 0; j < n; j++ )
- rVal[j][i] = v[i][j];
+ rVal[(int)j][(int)i] = v[(int)i][(int)j];
return rVal;
}
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
PyMOL-users mailing list (PyMOL-users@lists.sourceforge.net)
Info Page: https://lists.sourceforge.net/lists/listinfo/pymol-users
Archives: http://www.mail-archive.com/pymol-users@lists.sourceforge.net
