EI/VirtualLeaf Changeset - 4f82fc35a2b3 · Centrum Wiskunde & Informatica (CWI)

Changeset - 4f82fc35a2b3

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Roeland Merks - 15 years ago 2010-06-22 15:16:30
roeland.merks@cwi.nl

Added XML viewport tag to save and readback viewport settings (zoom) and made sure FigureEditor catches MouseMove events after entering rotation mode.

6 files changed with 142 insertions and 10 deletions:

src/VirtualLeaf.cpp

src/canvas.cpp

src/canvas.h

src/cellbase.h

src/mainbase.cpp

117

src/mainbase.h

0 comments (0 inline, 0 general)

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -144,12 +144,13 @@ void MainBase::Plot(int resize_stride) @@
   static int count=0;
   if (resize_stride) {
     if ( !((++count)%resize_stride) ) {
       FitLeafToCanvas();
+    }
+  }
   mesh.LoopCells(DrawCell(),canvas,*this);
   if (ShowNodeNumbersP())
     mesh.LoopNodes( bind2nd (mem_fun_ref ( &Node::DrawIndex), &canvas ) ) ;
   if (ShowCellNumbersP())
     mesh.LoopCells( bind2nd (mem_fun_ref ( &Cell::DrawIndex), &canvas ) ) ;

src/canvas.cpp

➞

Show inline comments

@@ @@ -208,13 +208,13 @@ void FigureEditor::mousePressEvent(QMous @@
   moving = 0;
+}
 void FigureEditor::mouseMoveEvent(QMouseEvent* e)
+{
-  // User choose "rotation mode" and we can rotate the object around its center of mass
+  // User chooses "rotation mode" and we can rotate the object around its center of mass
   if (dynamic_cast<Main *>(parent())->RotationModeP()) {
     QPointF p = mapToScene(e->pos());
     p.setX(p.x() / Cell::Magnification());
     p.setY(p.y() / Cell::Magnification());
@@ @@ -233,12 +233,14 @@ void FigureEditor::mouseMoveEvent(QMouse @@
     mesh.Rotate(d_alpha, ( Vector(rotation_midpoint) + Cell::Offset() ) / Cell::Factor() );
     dynamic_cast<Main *>(parent())->Plot(0);
     FullRedraw();
     return;
+  }
   if ( moving ) {
     QPointF p = mapToScene(e->pos());
     moving->userMove(p.x() - moving_start.x(),
 		     p.y() - moving_start.y());
     moving_start = p;
@@ @@ -783,13 +785,13 @@ int Main::readStateXML(const char *filen @@
     XMLReadSettings(settings);
     xmlFree(settings);
     Cell::SetMagnification(1);
     Cell::setOffset(0,0);
     FitLeafToCanvas();
     currentFile =  QString(filename);
     Plot();
     QString status_message = QString("Successfully read leaf from file %1. Time is %2 h.").arg(currentFile).arg(mesh.getTimeHours().c_str());
     cerr << status_message.toStdString() << endl;
     setCaption(caption_with_file.arg(filename));
@@ @@ -1221,13 +1223,15 @@ void Main::FitLeafToCanvas(void) @@
   Vector border = ((ur-ll)/5.);
   QRectF bb( ll.x - border.x, ll.y - border.y, ur.x-ll.x + 2*border.x, ur.y-ll.y + 2*border.y );
   // cerr << ur << ", " << ll << endl;
   editor->fitInView(bb, Qt::KeepAspectRatio);
   // editor->fitInView(bb, Qt::KeepAspectRatio);
   editor->ensureVisible(bb);
   //editor->setTransform(viewport);
+}
 void Main::CleanMesh(void)
+{
   vector<double> clean_chem(Cell::NChem());
   vector<double> clean_transporters(Cell::NChem());
@@ @@ -1297,13 +1301,13 @@ void Main::RandomizeMesh(void) @@
+}
 void Main::XMLReadSettings(xmlNode *settings)
+{
   MainBase::XMLReadSettings(settings);
   view->setItemChecked(com_id, showcentersp);
   view->setItemChecked(mesh_id, showmeshp);
   view->setItemChecked(border_id, showbordercellp);
   view->setItemChecked(node_number_id, shownodenumbersp);
   view->setItemChecked(cell_number_id, showcellnumbersp);
   view->setItemChecked(cell_axes_id, showcellsaxesp);
@@ @@ -1312,12 +1316,14 @@ void Main::XMLReadSettings(xmlNode *sett @@
   view->setItemChecked(only_boundary_id, showboundaryonlyp);
   view->setItemChecked(fluxes_id, showfluxesp);
   view->setItemChecked(hide_cells_id, hidecellsp);
   options->setItemChecked(dyn_cells_id, dynamicscellsp);
   view->setItemChecked( cell_walls_id, showwallsp);
   view->setItemChecked( apoplasts_id, showapoplastsp);
   editor->setTransform(viewport);
+}
 xmlNode *Main::XMLSettingsTree(void)
+{
   showcentersp = view->isItemChecked(com_id);
@@ @@ -1332,10 +1338,13 @@ xmlNode *Main::XMLSettingsTree(void) @@
   showfluxesp = view->isItemChecked(fluxes_id);
   dynamicscellsp = options->isItemChecked(dyn_cells_id);
   showwallsp = view->isItemChecked( cell_walls_id);
   showapoplastsp = view->isItemChecked( apoplasts_id);
   hidecellsp = view->isItemChecked( hide_cells_id);
   return MainBase::XMLSettingsTree();
   xmlNode *settings = MainBase::XMLSettingsTree();
   QTransform viewport(editor->transform());
   xmlAddChild(settings, XMLViewportTree(viewport));
   return settings;
+}
 /* finis */

src/canvas.h

➞

Show inline comments

@@ @@ -170,22 +170,27 @@ class Main : public Q3MainWindow, public @@
     UserMessage("Rotation mode. Click mouse to exit.");
     if (editor) {
       editor->rot_angle = 0. ;
       // Exit rotation mode if mouse is clicked
       connect(editor, SIGNAL(MousePressed()), this, SLOT(ExitRotationMode()));
       editor->setMouseTracking(true);
+    }
+  }
   void ExitRotationMode(void)
+  {
     UserMessage("Exited rotation mode.",2000);
     options->setItemChecked(rotation_mode_id, false);
     if (editor)
       disconnect(editor, SIGNAL(MousePressed()), this, SLOT(ExitRotationMode()));
     editor->setMouseTracking(false);
+  }
   virtual void UserMessage(QString message, int timeout=0);
   void Refresh(void) { Plot(); }
   void PauseIfRunning(void);
   void ContIfRunning(void);

src/cellbase.h

➞

Show inline comments

@@ @@ -61,15 +61,12 @@ class CellsStaticDatamembers { @@
  public:
   CellsStaticDatamembers(void) {
     ncells = 0;
     nchem = 0;
     base_area = 0.;
 #ifdef QDEBUG
     qDebug() << "Constructor of CellsStaticDatamembers" << endl;
 #endif
+  }
   ~CellsStaticDatamembers() {
 #ifdef QDEBUG
     qDebug() << "Oops! Desctructor of CellsStaticDatamembers called" << endl;
 #endif
+  }

src/mainbase.cpp

➞

Show inline comments

@@ @@ -25,14 +25,34 @@ @@
 #include "mainbase.h"
 #include "xmlwrite.h"
 #include <sstream>
 #include <string>
 #include <QLocale>
 static const std::string _module_id("$Id$");
 xmlNode *MainBase::XMLViewportTree(QTransform &transform) const {
   QLocale standardlocale(QLocale::C);
   xmlNode *xmlviewport = xmlNewNode(NULL, BAD_CAST "viewport");
+  {
     xmlNewProp(xmlviewport, BAD_CAST "m11", BAD_CAST standardlocale.toString(transform.m11()).toStdString().c_str() );
     xmlNewProp(xmlviewport, BAD_CAST "m12", BAD_CAST standardlocale.toString(transform.m12()).toStdString().c_str() );
     xmlNewProp(xmlviewport, BAD_CAST "m21", BAD_CAST standardlocale.toString(transform.m21()).toStdString().c_str() );
     xmlNewProp(xmlviewport, BAD_CAST "m22", BAD_CAST standardlocale.toString(transform.m22()).toStdString().c_str() );
     xmlNewProp(xmlviewport, BAD_CAST "dx", BAD_CAST standardlocale.toString(transform.dx()).toStdString().c_str() );
     xmlNewProp(xmlviewport, BAD_CAST "dy", BAD_CAST standardlocale.toString(transform.dy()).toStdString().c_str() );
+ }
   return xmlviewport;
+}
 xmlNode *MainBase::XMLSettingsTree(void) const {
   xmlNode *xmlsettings = xmlNewNode(NULL, BAD_CAST "settings");
+  {
     xmlNode *xmloption = xmlNewChild(xmlsettings, NULL, BAD_CAST "setting", NULL);
     xmlNewProp(xmloption, BAD_CAST "name", BAD_CAST "show_cell_centers");
@@ @@ -131,28 +151,122 @@ xmlNode *MainBase::XMLSettingsTree(void) @@
     text << bool_name(hidecellsp);
     xmlNewProp(xmloption, BAD_CAST "val", BAD_CAST text.str().c_str());
+  }
   return xmlsettings;
+}
 void MainBase::XMLReadViewport(xmlNode *settings) {
   if (settings == 0) {
     return;
+  }
   qreal m11=25,m12=0,m21=0,m22=25,dx=0,dy=0;
   QLocale standardlocale(QLocale::C);
   xmlNode *cur = settings->xmlChildrenNode;
   while (cur!=NULL) {
     if (!xmlStrcmp(cur->name,(const xmlChar *)"viewport")) {
       bool ok;
+      {
 	xmlChar *v_str = xmlGetProp(cur, BAD_CAST "m11");
 	if (v_str==0) {
 	  MyWarning::unique_warning("Error reading viewport in mainbase.cpp");
+	}
 	if (v_str != NULL) {
 	  m11=standardlocale.toDouble((char *)v_str, &ok);
 	  if (!ok) MyWarning::error("Could Not Convert \"%S\" To Double In XMLRead.",(char *)v_str);
 	  xmlFree(v_str);
+	}
+      }
+      {
 	xmlChar *v_str = xmlGetProp(cur, BAD_CAST "m12");
 	if (v_str==0) {
 	  MyWarning::unique_warning("Error reading viewport in mainbase.cpp");
+	}
 	if (v_str != NULL) {
 	  m12=standardlocale.toDouble((char *)v_str, &ok);
 	  if (!ok) MyWarning::error("Could Not Convert \"%S\" To Double In XMLRead.",(char *)v_str);
 	  xmlFree(v_str);
+	}
+      }
+      {
 	xmlChar *v_str = xmlGetProp(cur, BAD_CAST "m21");
 	if (v_str==0) {
 	  MyWarning::unique_warning("Error reading viewport in mainbase.cpp");
+	}
 	if (v_str != NULL) {
 	  m21=standardlocale.toDouble((char *)v_str, &ok);
 	  if (!ok) MyWarning::error("Could Not Convert \"%S\" To Double In XMLRead.",(char *)v_str);
 	  xmlFree(v_str);
+	}
+      }
+      {
 	xmlChar *v_str = xmlGetProp(cur, BAD_CAST "m22");
 	if (v_str==0) {
 	  MyWarning::unique_warning("Error reading viewport in mainbase.cpp");
+	}
 	if (v_str != NULL) {
 	  m22=standardlocale.toDouble((char *)v_str, &ok);
 	  if (!ok) MyWarning::error("Could Not Convert \"%S\" To Double In XMLRead.",(char *)v_str);
 	  xmlFree(v_str);
+	}
+      }
+      {
 	xmlChar *v_str = xmlGetProp(cur, BAD_CAST "dx");
 	if (v_str==0) {
 	  MyWarning::unique_warning("Error reading viewport in mainbase.cpp");
+	}
 	if (v_str != NULL) {
 	  dx=standardlocale.toDouble((char *)v_str, &ok);
 	  if (!ok) MyWarning::error("Could Not Convert \"%S\" To Double In XMLRead.",(char *)v_str);
 	  xmlFree(v_str);
+	}
+      }
+      {
 	xmlChar *v_str = xmlGetProp(cur, BAD_CAST "dy");
 	if (v_str==0) {
 	  MyWarning::unique_warning("Error reading viewport in mainbase.cpp");
+	}
 	if (v_str != NULL) {
 	  dy=standardlocale.toDouble((char *)v_str, &ok);
 	  if (!ok) MyWarning::error("Could Not Convert \"%S\" To Double In XMLRead.",(char *)v_str);
 	  xmlFree(v_str);
+	}
+      }
+    }
     cur=cur->next;
+  }
   viewport = QTransform(m11,m12,m21,m22,dx,dy);
+}
 void MainBase::XMLReadSettings(xmlNode *settings)
+{
   // Many files have no settings section, so don't complain about it.
   // Defaults will be used instead.
   if (settings == 0) {
     return;
+  }
   XMLReadViewport(settings);
   xmlNode *cur = settings->xmlChildrenNode;
   while (cur!=NULL) {
     if ((!xmlStrcmp(cur->name, (const xmlChar *)"setting"))){
       xmlChar *name = xmlGetProp(cur, BAD_CAST "name");
       xmlChar *val = xmlGetProp(cur, BAD_CAST "val");
       if (!xmlStrcmp(name, (const xmlChar *)"show_cell_centers")) {
 	showcentersp = strtobool( (const char *)val );
+      }
       if (!xmlStrcmp(name, (const xmlChar *)"show_nodes")) {
 	showmeshp = strtobool( (const char *)val );
@@ @@ -190,13 +304,15 @@ void MainBase::XMLReadSettings(xmlNode * @@
       if (!xmlStrcmp(name, (const xmlChar *)"cell_growth")) {
 	dynamicscellsp = strtobool( (const char *)val );
+      }
       if (!xmlStrcmp(name,(const xmlChar *)"hide_cells")) {
 	hidecellsp = strtobool( (const char *)val );
+      }
       xmlFree(name);
       xmlFree(val);
+    }
     cur=cur->next;
+  }
+}

src/mainbase.h

➞

Show inline comments

@@ @@ -89,29 +89,33 @@ class MainBase { @@
     for (; it != list.end(); ++it) {
       if ( *it )
 	delete *it;
+    }
   };
   virtual void XMLReadSettings(xmlNode *settings);
   virtual void XMLReadViewport(xmlNode *viewport);
   virtual double getFluxArrowsize(void) { return 10.;}
   void Save(const char *fname, const char *format, int sizex=640, int sizey=480);
   void CutSAM(void);
   void Plot(int resize_stride=10);
   virtual void UserMessage(QString message, int timeout = 0) {
     timeout = 0; // merely to obviate 'warning unused parameter' message
     cerr << message.toAscii().constData() << endl;
+  }
   Mesh &mesh;
   QTransform viewport;
  protected:
   QGraphicsScene &canvas;
   virtual xmlNode *XMLSettingsTree(void) const;
   virtual xmlNode *XMLViewportTree(QTransform &transform) const;
  protected:
   bool showcentersp;
   bool showmeshp;
   bool showbordercellp;
   bool shownodenumbersp;
   bool showcellnumbersp;

0 comments (0 inline, 0 general)