Moved ngmx to C++, renamed it to view.

[alexxy/gromacs.git] / src / programs / view / nmol.cpp

diff --git a/src/ngmx/nmol.c b/src/programs/view/nmol.cpp
similarity index 94%
rename from src/ngmx/nmol.c
rename to src/programs/view/nmol.cpp
index c9dd2f781d12b1f1bef23d2af044b85447a73511..8851f6c5fa5a63edc8fed432d10566de46c542a8 100644 (file)
--- a/src/ngmx/nmol.c
+++ b/src/programs/view/nmol.cpp
@@ -9,7 +9,7 @@
  *                        VERSION 3.2.0
  * Written by David van der Spoel, Erik Lindahl, Berk Hess, and others.
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
- * Copyright (c) 2001-2004, The GROMACS development team,
+ * Copyright (c) 2001-2013, The GROMACS development team,
  * check out http://www.gromacs.org for more information.
 
  * This program is free software; you can redistribute it and/or
@@ -53,7 +53,7 @@
 
 #define MSIZE 4
 
-static gmx_bool MWCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
+static bool MWCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
 {
     t_molwin *mw;
     Window    To;
@@ -93,12 +93,12 @@ static gmx_bool MWCallBack(t_x11 *x11, XEvent *event, Window w, void *data)
         default:
             break;
     }
-    return FALSE;
+    return false;
 }
 
 void set_def (t_molwin *mw, int ePBC, matrix box)
 {
-    mw->bShowHydrogen = TRUE;
+    mw->bShowHydrogen = true;
     mw->bond_type     = eBFat;
     mw->ePBC          = ePBC;
     mw->boxtype       = esbRect;
@@ -131,7 +131,7 @@ void map_mw(t_x11 *x11, t_molwin *mw)
     XMapWindow(x11->disp, mw->wd.self);
 }
 
-gmx_bool toggle_hydrogen(t_x11 *x11, t_molwin *mw)
+bool toggle_hydrogen(t_x11 *x11, t_molwin *mw)
 {
     mw->bShowHydrogen = !mw->bShowHydrogen;
     ExposeWin(x11->disp, mw->wd.self);
@@ -175,7 +175,7 @@ void done_mw(t_x11 *x11, t_molwin *mw)
 
 static void draw_atom(Display *disp, Window w, GC gc,
                       atom_id ai, iv2 vec2[], unsigned long col[], int size[],
-                      gmx_bool bBall, gmx_bool bPlus)
+                      bool bBall, bool bPlus)
 {
     int xi, yi;
 
@@ -217,7 +217,7 @@ static void my_init_pbc(matrix box)
     }
 }
 
-static gmx_bool local_pbc_dx(rvec x1, rvec x2)
+static bool local_pbc_dx(rvec x1, rvec x2)
 {
     int  i;
     real dx;
@@ -227,19 +227,19 @@ static gmx_bool local_pbc_dx(rvec x1, rvec x2)
         dx = x1[i]-x2[i];
         if (dx > gl_hbox[i])
         {
-            return FALSE;
+            return false;
         }
         else if (dx <= gl_mhbox[i])
         {
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 static void draw_bond(Display *disp, Window w, GC gc,
                       atom_id ai, atom_id aj, iv2 vec2[],
-                      rvec x[], unsigned long col[], int size[], gmx_bool bBalls)
+                      rvec x[], unsigned long col[], int size[], bool bBalls)
 {
     unsigned long   ic, jc;
     int             xi, yi, xj, yj;
@@ -247,8 +247,8 @@ static void draw_bond(Display *disp, Window w, GC gc,
 
     if (bBalls)
     {
-        draw_atom(disp, w, gc, ai, vec2, col, size, TRUE, FALSE);
-        draw_atom(disp, w, gc, aj, vec2, col, size, TRUE, FALSE);
+        draw_atom(disp, w, gc, ai, vec2, col, size, true, false);
+        draw_atom(disp, w, gc, aj, vec2, col, size, true, false);
     }
     else
     {
@@ -313,12 +313,12 @@ void create_visibility(t_manager *man)
     {
         if (obj->eV != eVHidden)
         {
-            man->bVis[obj->ai] = TRUE;
+            man->bVis[obj->ai] = true;
             switch (obj->eO)
             {
                 case eOBond:
                 case eOHBond:
-                    man->bVis[obj->aj] = TRUE;
+                    man->bVis[obj->aj] = true;
                     break;
                 default:
                     break;
@@ -353,7 +353,7 @@ int filter_vis(t_manager *man)
 {
     int          i, nobj, nvis, nhide;
     atom_id      ai;
-    gmx_bool     bAdd, *bVis;
+    bool         bAdd, *bVis;
     t_object    *obj;
     t_object    *newobj;
 
@@ -391,14 +391,14 @@ int filter_vis(t_manager *man)
 
 void draw_objects(Display *disp, Window w, GC gc, int nobj,
                   t_object objs[], iv2 vec2[], rvec x[],
-                  unsigned long col[], int size[], gmx_bool bShowHydro, int bond_type,
-                  gmx_bool bPlus)
+                  unsigned long col[], int size[], bool bShowHydro, int bond_type,
+                  bool bPlus)
 {
-    gmx_bool     bBalls;
+    bool         bBalls;
     int          i;
     t_object    *obj;
 
-    bBalls = FALSE;
+    bBalls = false;
     switch (bond_type)
     {
         case eBThin:
@@ -411,8 +411,8 @@ void draw_objects(Display *disp, Window w, GC gc, int nobj,
             XSetLineAttributes(disp, gc, 5, LineSolid, CapNotLast, JoinRound);
             break;
         case eBSpheres:
-            bBalls = TRUE;
-            bPlus  = FALSE;
+            bBalls = true;
+            bPlus  = false;
             break;
         default:
             gmx_fatal(FARGS, "Invalid bond_type selected: %d\n", bond_type);