Commit 74008d59 authored by Graham Inggs's avatar Graham Inggs

Refresh all patches, remove trailing whitespace and fix permissions

parent 149b43dd
qutemol (0.4.1~cvs20081111-9) UNRELEASED; urgency=medium
* Migrate from SVN to Git
* Refresh all patches, remove trailing whitespace and fix permissions
-- Graham Inggs <ginggs@debian.org> Mon, 25 Dec 2017 11:10:09 +0000
......
......@@ -17,13 +17,13 @@ Subject: modification to source code
OBJS = \
src/AO.o \
@@ -19,12 +19,33 @@ OBJS = \
@@ -19,12 +19,33 @@
src/main.o \
src/wx_trackball.o \
vcg/wrap/gui/trackball.o \
- vcg/wrap/gui/trackmode.o
+ vcg/wrap/gui/trackmode.o \
+ src/progress.o src/MyCanvas.o src/saveSnapDialog.o src/gifSave.o src/pngSave.o
+ src/progress.o src/MyCanvas.o src/saveSnapDialog.o src/gifSave.o src/pngSave.o
all: qutemol
......@@ -53,6 +53,3 @@ Subject: modification to source code
+src/saveSnapDialog.o: src/saveSnapDialog.cpp
+src/gifSave.o: src/gifSave.cpp
+src/pngSave.o: src/pngSave.cpp
diff --git a/qutemol.cfg b/qutemol.cfg
new file mode 100644
index 0000000..10abe74
......@@ -4,105 +4,102 @@ Subject: modification to source code
--- /dev/null
+++ b/qutemol.cfg
@@ -0,0 +1,99 @@
@@ -0,0 +1,98 @@
+TSIZE = 1024
+ \\ favoured texture size for molecule
+ \\ (default: 1024 )
+ \\ (default: 1024 )
+
+MAX_TSIZE = 2048
+ \\ maximal texture size (used when molecule too large for TSIZE)
+ \\ (default: 2048 )
+ \\ (default: 2048 )
+
+N_VIEW_DIR = 128
+ \\ number of view directions ussed in AO computation
+ \\ (default: 128 )
+ \\ (default: 128 )
+
+SHADOWMAP_SIZE = 1024
+ \\ texture size for shadowmap
+ \\ (default: 1024 )
+ \\ (default: 1024 )
+
+AOSM_SIZE = 256
+ \\ texture size for shadowmmaps for AO computation
+ \\ (default: 256 )
+ \\ (default: 256 )
+
+MOVING_QUALITY = 100
+ \\ Quality of image on screen when molecole moves (between 50..200)
+ \\ (default: 100 )
+ \\ (default: 100 )
+
+STILL_QUALITY = 200
+ \\ Quality of image on screen when molecole is still (between 50..200)
+ \\ (default: 200 )
+ \\ (default: 200 )
+
+doubleSM = 1
+ \\ if 1, use double ShadomMap optimization (two way lights)
+ \\ (default: 1 )
+ \\ (default: 1 )
+
+NVIDIA_PATCH = 0
+ \\ use 1 - *AND* disable doubleSM - to patch a bug reported on some Nvidia cards (warning: lowers visual quality!)
+ \\ (default: 0 )
+ \\ (default: 0 )
+
+SNAP_SIZE = 1024
+ \\ snapshots resolution (per side)
+ \\ (default: 1024 )
+ \\ (default: 1024 )
+
+SNAP_ANTIALIAS = 1
+ \\ if 1, antialias exported snapshots
+ \\ (default: 1 )
+ \\ (default: 1 )
+
+PNG_TRANSPARENT = 0
+ \\ if 1, save PNG images with tranparent background
+ \\ (default: 0 )
+ \\ (default: 0 )
+
+GIF_SNAP_SIZE = 256
+ \\ resolution of exported GIF animations
+ \\ (default: 256 )
+ \\ (default: 256 )
+
+ \\ PARAMETERS FOR GIF ANIMATION
+ \\ PARAMETERS FOR GIF ANIMATION
+ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+GIF_INITIAL_PAUSE = 0
+ \\ initial pause in msec before each animation loop
+ \\ (default: 0 )
+ \\ (default: 0 )
+
+GIF_ANIMATION_MODE = 0
+ \\ if 0: full rotation. If 1: inspection mode (rotation around current viewpoint). If 2: six-views show.
+ \\ (default: 0 )
+ \\ (default: 0 )
+
+GIF_ROT_N_FRAMES = 60
+ \\ number of frames of exported GIF animations (for full rotation)
+ \\ (default: 60 )
+ \\ (default: 60 )
+
+GIF_GIF_ROT_MSEC = 3000
+ \\ total duration in msec of GIF animations loop (for full rotation)
+ \\ (default: 3000 )
+ \\ (default: 3000 )
+
+GIF_GIF_ROT_SIDEVIEW_ANGLE = 10
+ \\ angle (in -45 +45). If 0, perfect side rotation; if >0, look from above; if <0, look from below (for full rotation)
+ \\ (default: 10 )
+ \\ (default: 10 )
+
+GIF_INSP_N_FRAMES = 60
+ \\ number of frames of exported GIF animations (for inspections)
+ \\ (default: 60 )
+ \\ (default: 60 )
+
+GIF_INSP_MSEC = 3000
+ \\ total duration in msec of GIF animations loop (for inspections)
+ \\ (default: 3000 )
+ \\ (default: 3000 )
+
+GIF_INSP_ANGLE = 10
+ \\ in (10..45). Animation is an inspection around current view point (for inspections)
+ \\ (default: 10 )
+ \\ (default: 10 )
+
+GIF_6SIDES_N_FRAMES = 10
+ \\ number of frames of exported GIF animations (for six-views show)
+ \\ (default: 10 )
+ \\ (default: 10 )
+
+GIF_6SIDES_MSEC = 400
+ \\ duration in msec of each face shift (for six-views show)
+ \\ (default: 400 )
+ \\ (default: 400 )
+
+GIF_6SIDES_PAUSE = 1000
+ \\ pause in msec after each face shift (for six-views show)
+ \\ (default: 1000 )
+
diff --git a/src/AO.cpp b/src/AO.cpp
index 26b0f0b..6f6f579 100644
+ \\ (default: 1000 )
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/AO.cpp
+++ b/src/AO.cpp
@@ -109,7 +109,7 @@ AO::AO( Point3f _dir, Mol &m) {
@@ -109,7 +109,7 @@
buf.resize(target*target,infty);
......@@ -13,5 +13,3 @@ Subject: modification to source code
QAtom &a=m.atom[i];
CheckAtom(a);
RenderSphere( a.trp[0], a.trp[1], a.trp[2], a.trr );
diff --git a/src/AO.h b/src/AO.h
index 2df500b..d5512a4 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/AO.h
+++ b/src/AO.h
@@ -12,7 +12,7 @@ class AO{
@@ -12,7 +12,7 @@
inline int index(int x, int y){
int res=x+bufx*y;
if (res<0) res=0;
......@@ -13,5 +13,3 @@ Subject: modification to source code
return res;
//return x+bufx*y;
}
diff --git a/src/AOgpu.cpp b/src/AOgpu.cpp
index f569555..8b63a1d 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/AOgpu.cpp
+++ b/src/AOgpu.cpp
@@ -51,7 +51,7 @@ void AOgpu::OpenGLSnap()
@@ -51,7 +51,7 @@
snapy = vp[3];
//Create(tx,ty);
......@@ -13,7 +13,7 @@ Subject: modification to source code
GLenum mtype = 0;
@@ -117,11 +117,11 @@ AOgpu::AOgpu( Point3f _dir, Mol &m) {
@@ -117,11 +117,11 @@
OpenGLSnap();
// interpret spanshot
......@@ -27,7 +27,7 @@ Subject: modification to source code
/*static*/
// vector<int> found(sum.size(), false );
@@ -140,7 +140,7 @@ AOgpu::AOgpu( Point3f _dir, Mol &m) {
@@ -140,7 +140,7 @@
......@@ -36,7 +36,7 @@ Subject: modification to source code
sum[ snap[i]&0x00ffffff ] =
(sum[ snap[i]&0x00ffffff ]+(snap[i]>>24))&0x00ffffff | (div<<24);
//printf("[%d]",snap[i]>>24);
@@ -196,7 +196,7 @@ void AOgpu::Reset(Mol &m){
@@ -196,7 +196,7 @@
//ReloadTexture(fakeTexture, false);
div=0;
......@@ -45,7 +45,7 @@ Subject: modification to source code
sum.resize(hardSettings.TSIZE*hardSettings.TSIZE,0);
} else {
sum.clear();
@@ -218,7 +218,7 @@ inline unsigned int BitCount(unsigned int x){
@@ -218,7 +218,7 @@
}
void AOgpu::GetFinalTexture(vector<Byte> &text,Mol &m){
......@@ -54,5 +54,3 @@ Subject: modification to source code
//m.SmoothTexture( sum, hardSettings.TSIZE );
int maxt=sum.size();
diff --git a/src/AtomColor.cpp b/src/AtomColor.cpp
index 44c6ff8..6c3d9fa 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/AtomColor.cpp
+++ b/src/AtomColor.cpp
@@ -165,7 +165,7 @@ E2C["MT"]= /*[235, 0, 38]*/ 0xFF1493 /* 0xEB0026 */ ;
@@ -165,7 +165,7 @@
}
}
......@@ -13,5 +13,3 @@ Subject: modification to source code
InitTables();
// upperCase(name);
diff --git a/src/CgUtil.cpp b/src/CgUtil.cpp
index 2f880bc..ffd8a4c 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/CgUtil.cpp
+++ b/src/CgUtil.cpp
@@ -33,7 +33,7 @@ bool CgUtil::do_use_doubleshadow(){
@@ -33,7 +33,7 @@
return ((P_double_shadows) && (can_use_doubleshadow()));
}
......@@ -13,7 +13,7 @@ Subject: modification to source code
bool CgUtil::Load(const char* filename){
FILE *f=fopen(filename, "rt");
@@ -700,7 +700,7 @@ CMP t.z, lighting.z, -t.z, t.z; \n\
@@ -700,7 +700,7 @@
if ((!do_use_doubleshadow())&&(P_light_base>0)) {
sprintf(fp,"%s\n\
CMP t.z, lighting.z, 1, t.z; # if light<0, then in shadow \n\
......@@ -22,7 +22,7 @@ Subject: modification to source code
}
if (P_shadowstrenght<1) {
@@ -789,7 +789,7 @@ LRP t, tmp.x, 1, t; \n\
@@ -789,7 +789,7 @@
} else {
if (P_col_atoms_bri<1.0)
{
......@@ -31,7 +31,7 @@ Subject: modification to source code
}
}
@@ -1499,7 +1499,7 @@ MUL t, t, t.z; \n\
@@ -1499,7 +1499,7 @@
MAD t, t, 0.5, 0.5; \n\
MAD t, t, {%5.2f,%5.2f,0,0}, {%5.2f, %5.2f, 0,0}; \n\
MAD t, {%5.2f,%5.2f,0,0}, disp, t; \n\n",
......@@ -40,5 +40,3 @@ Subject: modification to source code
else sprintf(fp, "%s\n\n\
## TEXTURING OCTAMAP STYLE \n\
diff --git a/src/Common.cpp b/src/Common.cpp
index 8475861..1d1d604 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/Common.cpp
+++ b/src/Common.cpp
@@ -136,8 +136,8 @@ void drawFrame(); // def later...
@@ -136,8 +136,8 @@
Byte* GetSnapshot(int sx, int sy, bool alpha){
......@@ -15,7 +15,7 @@ Subject: modification to source code
// set offline rendering
mainCanvas.RedirectToMemory();
@@ -448,7 +448,7 @@ void Mol::DrawHalos(){
@@ -448,7 +448,7 @@
);
glBegin(GL_QUADS);
......@@ -24,7 +24,7 @@ Subject: modification to source code
glEnd();
/*
@@ -496,7 +496,7 @@ void Mol::DrawShadowmap(bool invert){
@@ -496,7 +496,7 @@
shadowSettings.BindShaders();
glBegin(GL_QUADS);
......@@ -33,7 +33,7 @@ Subject: modification to source code
glEnd();
if (sticks) {
@@ -507,7 +507,7 @@ void Mol::DrawShadowmap(bool invert){
@@ -507,7 +507,7 @@
glBegin(GL_QUADS);
......@@ -42,7 +42,7 @@ Subject: modification to source code
glEnd();
}
glPopMatrix();
@@ -559,7 +559,7 @@ void Mol::Draw(){
@@ -559,7 +559,7 @@
if (draw_balls) {
if (draw_wireframe_balls) {
glDisable(GL_FRAGMENT_PROGRAM_ARB);
......@@ -51,7 +51,7 @@ Subject: modification to source code
glColor3f(0,0,1);
glBegin(GL_LINE_LOOP);
atom[i].Draw();
@@ -571,7 +571,7 @@ void Mol::Draw(){
@@ -571,7 +571,7 @@
//if (DL_atoms==666) glGenD
glBegin(GL_QUADS);
......@@ -60,7 +60,7 @@ Subject: modification to source code
glEnd();
glDisable(GL_VERTEX_PROGRAM_ARB);
@@ -604,7 +604,7 @@ void Mol::Draw(){
@@ -604,7 +604,7 @@
glColor3f(1,1,1);
if (draw_wireframe_sticks) {
glDisable(GL_FRAGMENT_PROGRAM_ARB);
......@@ -69,7 +69,7 @@ Subject: modification to source code
glColor3f(0,0.6,0.3);
glBegin(GL_LINE_LOOP);
bond[i].Draw();
@@ -613,7 +613,7 @@ void Mol::Draw(){
@@ -613,7 +613,7 @@
}
else {
glBegin(GL_QUADS);
......@@ -78,7 +78,7 @@ Subject: modification to source code
glEnd();
}
cgSettings.BindShaders();
@@ -703,12 +703,12 @@ bool Mol::DoingAO(){
@@ -703,12 +703,12 @@
if (!ready) return false;
if (cgSettings.P_texture==0) return false;
if (DirV.size()==0) return true;
......@@ -93,7 +93,7 @@ Subject: modification to source code
if (atom.size()<10) return (AOdoneLvl>6*k);
if (atom.size()<100) return (AOdoneLvl>4*k);
if (atom.size()<1000) return (AOdoneLvl>2*k);
@@ -751,15 +751,15 @@ void Mol::PrepareAOstart(){
@@ -751,12 +751,12 @@
}
// for testing purposes
......@@ -107,12 +107,8 @@ Subject: modification to source code
+ i++; if (i > (int)DirV.size()) i=0;
AOgpu2::UnBind();
AOdoneLvl=DirV.size();
-}
+}
bool Mol::PrepareAOstep(int nsteps){
@@ -772,7 +772,7 @@ bool Mol::PrepareAOstep(int nsteps){
}
@@ -772,7 +772,7 @@
AOdoneLvl++;
......@@ -121,7 +117,7 @@ Subject: modification to source code
}
void Mol::PrepareAOallAtOnce(){
@@ -786,12 +786,12 @@ void Mol::PrepareAOallAtOnce(){
@@ -786,12 +786,12 @@
//refresh();
FILE *f = fopen("res.txt", "w");
......@@ -139,7 +135,7 @@ Subject: modification to source code
fclose(f);
AOready=true;
@@ -822,7 +822,7 @@ Point3f getDirFromTrackball(vcg::Trackball &tb){
@@ -822,7 +822,7 @@
tb.GetView();
tb.Apply(false);
......@@ -148,5 +144,3 @@ Subject: modification to source code
float d[16];
glGetFloatv(GL_MODELVIEW_MATRIX,d);
glPopMatrix();
diff --git a/src/CubeMapSamp.h b/src/CubeMapSamp.h
index 5c19d8e..1290b9d 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/CubeMapSamp.h
+++ b/src/CubeMapSamp.h
@@ -14,7 +14,7 @@ public:
@@ -14,7 +14,7 @@
static void Transform(Point3f ax, Point3f ay, Point3f az){
......@@ -13,7 +13,7 @@ Subject: modification to source code
dirrot[i][0]=dir[i]*ax;
dirrot[i][1]=dir[i]*ay;
dirrot[i][2]=dir[i]*az;
@@ -61,7 +61,7 @@ public:
@@ -61,7 +61,7 @@
for (int x=0; x<size*3; x++)
{
int k=(x+tx+(y+ty)*s)*3;
......@@ -22,5 +22,3 @@ Subject: modification to source code
/*Byte col=0, colr=255;
if (div[i]>0) { col=(Byte)(sum[i]/div[i]*255); colr=128; }
t[k++]= colr;
diff --git a/src/HardSettings.cpp b/src/HardSettings.cpp
index ab38145..662fd56 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/HardSettings.cpp
+++ b/src/HardSettings.cpp
@@ -50,8 +50,7 @@ void HardSettings::SetDefaults(){
@@ -50,8 +50,7 @@
};
......@@ -14,7 +14,7 @@ Subject: modification to source code
"TSIZE",
"MAX_TSIZE",
"N_VIEW_DIR",
@@ -122,7 +121,7 @@ HardSettings::HardSettings(){
@@ -122,7 +121,7 @@
}
......@@ -23,7 +23,7 @@ Subject: modification to source code
"favoured texture size for molecule",
"maximal texture size (used when molecule too large for TSIZE)",
"number of view directions ussed in AO computation",
@@ -158,8 +157,13 @@ static char* comments[NNAMES]={
@@ -158,8 +157,13 @@
......@@ -39,7 +39,7 @@ Subject: modification to source code
bool present[NNAMES];
for (int i=0; i<NNAMES; i++) present[i]=false;
@@ -169,7 +173,7 @@ bool HardSettings::Load(char *fn){
@@ -169,7 +173,7 @@
if (!f) return false;
char token[255];
char last[255];
......@@ -48,7 +48,7 @@ Subject: modification to source code
while (1){
if (fscanf(f,"%s",token)!=1) break;
if (token[0]=='=') {
@@ -197,7 +201,7 @@ bool HardSettings::Load(char *fn){
@@ -197,7 +201,7 @@
return true;
}
......@@ -57,7 +57,7 @@ Subject: modification to source code
FILE *f=fopen(fn,"wt");
static HardSettings defaults;
@@ -216,12 +220,12 @@ bool HardSettings::Save(char *fn){
@@ -216,7 +220,7 @@
return true;
}
......@@ -66,11 +66,3 @@ Subject: modification to source code
SetDefaults();
if (!Load("qutemol.cfg")) {
Save("qutemol.cfg");
}
-}
+}
diff --git a/src/HardSettings.h b/src/HardSettings.h
index 053daa6..4e6df10 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/HardSettings.h
+++ b/src/HardSettings.h
@@ -45,9 +45,9 @@ public:
@@ -45,9 +45,9 @@
int GIF_6SIDES_PAUSE;
void SetDefaults();
......@@ -17,5 +17,3 @@ Subject: modification to source code
HardSettings();
private:
int* data[NNAMES];
diff --git a/src/Mol.cpp b/src/Mol.cpp
index 1ba4137..5467988 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/Mol.cpp
+++ b/src/Mol.cpp
@@ -16,7 +16,7 @@ using namespace std;
@@ -16,7 +16,7 @@
#include "Mol.h"
#include "HardSettings.h"
......@@ -13,7 +13,7 @@ Subject: modification to source code
#include "AtomColor.h"
#include "MyCanvas.h"
@@ -112,12 +112,12 @@ bool Mol::ReassignTexture(int textsize) {
@@ -112,12 +112,12 @@
// assign texture positions
......@@ -28,7 +28,7 @@ Subject: modification to source code
if (!bond[i].AssignNextTextPos( textsize )) return false;
}
@@ -217,8 +217,8 @@ atmA(&_a), atmB(&_b)
@@ -217,8 +217,8 @@
dir=(a-b).Normalize();
......@@ -39,7 +39,7 @@ Subject: modification to source code
/*a-=dir*(rada*0.60);
b+=dir*(radb*0.60);*/
@@ -266,21 +266,21 @@ void Mol::FindBonds(){
@@ -266,21 +266,21 @@
bool showprogress=atom.size()>2000;
......@@ -64,7 +64,7 @@ Subject: modification to source code
if (atom[j].px < px-MAXD) st=j; // move interval forward
else if (atom[j].px > px ) break; // no more atoms
else {
@@ -300,7 +300,7 @@ void Mol::FindBonds(){
@@ -300,7 +300,7 @@
if (showprogress) EndProgress();
......@@ -73,7 +73,7 @@ Subject: modification to source code
}
void Mol::SetSpaceFill(){
@@ -309,7 +309,7 @@ void Mol::SetSpaceFill(){
@@ -309,7 +309,7 @@
ReassignTextureAutosize();
......@@ -82,7 +82,7 @@ Subject: modification to source code
}
void Mol::SetBallAndSticks(float radius){
@@ -323,7 +323,7 @@ void Mol::SetBallAndSticks(float radius){
@@ -323,7 +323,7 @@
ReassignTextureAutosize();
......@@ -91,7 +91,7 @@ Subject: modification to source code
atom[i].r=atom[i].covalentr;
if (atom[i].r<radius) atom[i].r=radius;
}
@@ -341,7 +341,7 @@ void Mol::SetLicorice(float radius){
@@ -341,7 +341,7 @@
ReassignTextureAutosize();
......@@ -100,7 +100,7 @@ Subject: modification to source code
stick_radius=radius;
}
@@ -352,7 +352,7 @@ void Mol::Transform(const Point3f &ax,const Point3f &ay,const Point3f &az){
@@ -352,7 +352,7 @@
tx1=atom[0].trp[0]+atom[0].r;
ty0=atom[0].trp[1]-atom[0].r;
ty1=atom[0].trp[1]+atom[0].r;
......@@ -109,7 +109,7 @@ Subject: modification to source code
atom[i].Transform(ax,ay,az);
// update bounding box
if (atom[i].trp[0]-atom[i].r<tx0) tx0=atom[i].trp[0]-atom[i].r;
@@ -364,7 +364,7 @@ void Mol::Transform(const Point3f &ax,const Point3f &ay,const Point3f &az){
@@ -364,7 +364,7 @@
}
void Mol::DuplicateTexels(vector<Byte> &t, int texsize){
......@@ -118,7 +118,7 @@ Subject: modification to source code
atom[i].s.DuplicateTexels(t, texsize, atom[i].tx, atom[i].ty);
}
}
@@ -397,7 +397,7 @@ static void AddTmpBonds(string st, vector<int> &v)
@@ -397,7 +397,7 @@
int startAtom=atoi( st.substr(6,5).c_str());
// assert(startAtom >0 && (startAtom-1)<atom.size()); // this assert cannot be used anymore from a static method
int i=1;
......@@ -127,7 +127,7 @@ Subject: modification to source code
{
// printf("'%s' -> '%s' (%c)\n",st.substr(6,5).c_str(),st.substr(6+i*5,5).c_str(),st[6+i*5+4]);
int secondAtom=atoi( st.substr(6+i*5,5).c_str());
@@ -427,7 +427,7 @@ bool Mol::ReadPdb(const char *_filename){
@@ -427,7 +427,7 @@
if (fseek(f, 0, SEEK_END)==0) size=ftell (f);
fseek (f, 0, SEEK_SET);
bool showprogress=(size==0) || (size>1000000);
......@@ -136,7 +136,7 @@ Subject: modification to source code
char buf[82];
buf[81]=0;
@@ -464,7 +464,7 @@ bool Mol::ReadPdb(const char *_filename){
@@ -464,7 +464,7 @@
//printf("Found %d atoms!\n", atom.size() );
nhetatm=0; natm=0;
......@@ -145,7 +145,7 @@ Subject: modification to source code
if (atom[i].hetatomFlag) nhetatm++; else natm++;
}
@@ -472,7 +472,7 @@ bool Mol::ReadPdb(const char *_filename){
@@ -472,7 +472,7 @@
UpdateColors();
......@@ -154,7 +154,7 @@ Subject: modification to source code
AddBond(tmpBondVec[i],tmpBondVec[i+1]);
}
@@ -525,11 +525,12 @@ char* Mol::GetMolName(){
@@ -525,11 +525,12 @@
void Mol::ComputeSize(){
// bounding box!
float x0,y0,z0,x1,y1,z1;
......@@ -169,7 +169,7 @@ Subject: modification to source code
if (x1>atom[i].px) x1=atom[i].px;
if (y1>atom[i].py) y1=atom[i].py;
if (z1>atom[i].pz) z1=atom[i].pz;
@@ -591,12 +592,12 @@ void QAtom::UpdateColors(float mode){
@@ -591,12 +592,12 @@
}
void Mol::UpdateColors(){
......@@ -184,5 +184,3 @@ Subject: modification to source code
bond[i].UpdateColors();
}
}
diff --git a/src/Mol.h b/src/Mol.h
index 4a8dedd..ac063be 100644
......@@ -4,34 +4,34 @@ Subject: modification to source code
--- a/src/Mol.h
+++ b/src/Mol.h
@@ -165,22 +165,22 @@ public:
@@ -165,22 +165,22 @@
void Transform(const Point3f &ax,const Point3f &ay,const Point3f &az);
void ScaleTransl(float scale){
- for (int i=0; i<atom.size(); i++)
+ for (int i=0; i < (int)atom.size(); i++)
+ for (int i=0; i < (int)atom.size(); i++)
atom[i].ScaleTransl( -tx0, -ty0, scale);
}
void SmoothTexture(vector<Byte> &t, int siz){
- for (int i=0; i<atom.size(); i++)
+ for (int i=0; i < (int)atom.size(); i++)
+ for (int i=0; i < (int)atom.size(); i++)
atom[i].SmoothTexture(t,siz);
}
void SmoothTexture(vector<int> &t, int siz){
- for (int i=0; i<atom.size(); i++)
+ for (int i=0; i < (int)atom.size(); i++)
+ for (int i=0; i < (int)atom.size(); i++)
atom[i].SmoothTexture(t,siz);
}
void Zero() {
- for (int i=0; i<atom.size(); i++)
+ for (int i=0; i < (int)atom.size(); i++)
+ for (int i=0; i < (int)atom.size(); i++)
atom[i].s.Zero();
}
@@ -217,7 +217,7 @@ public:
@@ -217,7 +217,7 @@
bool DecentAO(); // true if AO (being computed) is "decent"
// for testing purposes
......@@ -40,5 +40,3 @@ Subject: modification to source code
int natm, nhetatm; // number of atoms of type hetatm and not ...
diff --git a/src/MyCanvas.cpp b/src/MyCanvas.cpp
index a40141d..a0c483f 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/MyCanvas.cpp
+++ b/src/MyCanvas.cpp
@@ -26,7 +26,7 @@ bool MyCanvas::SetAsOutput(){
@@ -26,7 +26,7 @@
return true;
}
......@@ -13,5 +13,3 @@ Subject: modification to source code
glBindTexture( GL_TEXTURE_2D, textureID[ currentRes ] );
}
diff --git a/src/MyCanvas.h b/src/MyCanvas.h
index fe7f92e..3eba806 100644
......@@ -4,7 +4,7 @@ Subject: modification to source code
--- a/src/MyCanvas.h
+++ b/src/MyCanvas.h
@@ -10,7 +10,7 @@ public:
@@ -10,7 +10,7 @@
Kind kind;
bool SetAsOutput();
......@@ -13,5 +13,3 @@ Subject: modification to source code
bool Test(){return SetAsOutput();}
diff --git a/src/MyTab.cpp b/src/MyTab.cpp
index e1f2e04..5d19b9d 100644
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
diff -urNad qutemol~/src/MyTab.cpp qutemol/src/MyTab.cpp
--- qutemol~/src/MyTab.cpp 2008-01-30 19:53:18.000000000 +0100
+++ qutemol/src/MyTab.cpp 2008-01-30 19:55:10.000000000 +0100
--- a/src/MyTab.cpp
+++ b/src/MyTab.cpp
@@ -28,7 +28,7 @@
// GEOM TAB
////////////
......@@ -18,7 +17,7 @@ diff -urNad qutemol~/src/MyTab.cpp qutemol/src/MyTab.cpp
static wxSlider *sliderLicorice, *sliderBallnstick,
- *sliderSetBaseColor , *sliderShineSize,
+ //*sliderSetBaseColor ,
+ //*sliderSetBaseColor ,
+ *sliderShineSize,
*sliderAwaren ,
*sliderSetBgbrightness,
......@@ -31,35 +30,39 @@ diff -urNad qutemol~/src/MyTab.cpp qutemol/src/MyTab.cpp
- "presets//real.preset",
- "presets//real2.preset",
- "presets//direct.preset",
-
- "presets//illustr.preset",
- "presets//illustr_new.preset",
- "presets//illustr_motm.preset",
-
- "presets//qutemol1.preset",
- "presets//qutemol2.preset",
- "presets//qutemol3.preset",
-
- "presets//coolb.preset",