]> Git trees. - libqmvoc.git/log
libqmvoc.git
19 years agoBenoit, kalziumglwidget.h/cpp grew just to big, that is why I
Carsten Niehaus [Mon, 26 Jun 2006 13:47:58 +0000 (13:47 +0000)]
Benoit, kalziumglwidget.h/cpp grew just to big, that is why I
moved the code into kalziumglhelperclasses.h/cpp, onle the GLWidget
itself stays in src/kalziumglwidget.cpp.

But for some cpp-magic-reasons I needed to remove two inline-calls,
don't ask me why. Furhtermore,
template<class T> void GLVector3<T>::construct_ortho_basis_given_first_vector
is not longer found when linking, not the slightest idea why... The
other methods of GLVector are found when linking...

CCMAIL:jacob@math.jussieu.fr

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=555148

19 years agoChanges in kalziumglwidget:
Benoît Jacob [Mon, 26 Jun 2006 10:18:33 +0000 (10:18 +0000)]
Changes in kalziumglwidget:

- added FPS (frames per second) counter. Enable it by #defining
  USE_FPS_COUNTER. (Currently enabled).

- added option to cache the rendering of the molecule using a GL display
  list. This improves speed, especially for rendering complex
  molecules; I have measured a speed increase above +35% in some cases
  (depends also on the style and the widget size). Enable it by
  #defining USE_DISPLAY_LIST. (Currently enabled).

Change in latticedialog:

- I allowed myself to comment out ui.glWidget->update(); in
  LatticeDialog::slotUpdateView() because normally this is being
  taken care of by slotSetMolecule; also I think that for a GL widget,
  one should call updateGL() instead of update(); not 100% sure here.
  Carsten, I didn't see the "blank widget" bug in the lattice viewer;
  have you already solved it?

M    kalzium/src/kalziumglwidget.h
M    kalzium/src/kalziumglwidget.cpp
M    kalzium/src/latticedialog.cpp

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=555113

19 years agoAdd intelligent (so to speak) level-of-detail handling in Kalzium's
Benoît Jacob [Sun, 25 Jun 2006 13:08:39 +0000 (13:08 +0000)]
Add intelligent (so to speak) level-of-detail handling in Kalzium's
OpenGL engine. For instance smaller spheres will be drawn with smaller
detail level.

CCMAIL: cniehaus@gmx.de

M    kalzium/src/kalziumglwidget.cpp

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.cpp; revision=554822

19 years agoM kalzium/src/kalziumglwidget.h
Benoît Jacob [Sun, 25 Jun 2006 12:34:01 +0000 (12:34 +0000)]
M    kalzium/src/kalziumglwidget.h
M    kalzium/src/kalziumglwidget.cpp

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=554813

19 years agoMany OpenGL-fixes from Benoit.
Carsten Niehaus [Sat, 24 Jun 2006 21:04:21 +0000 (21:04 +0000)]
Many OpenGL-fixes from Benoit.

Benoit, feel free to commit yourself from now on!

Benoit, is it possible that you forgot to center the molecule? They are rotating here like they did in the very first version of your code... But the reason might be that I am now using OpenBabel 2.1...

CCMAIL:jacob@math.jussieu.fr

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=554702

19 years agoBenoit, please copy test.cml to /home/kde4/ and then test the latticeviewer. Somehow...
Carsten Niehaus [Sat, 24 Jun 2006 14:16:55 +0000 (14:16 +0000)]
Benoit, please copy test.cml to /home/kde4/ and then test the latticeviewer. Somehow I will need a new view-type for crystals. I want it to look a bit like this

http://upload.wikimedia.org/wikipedia/commons/d/db/NaCl-estructura_cristalina.svg

Somehow setting the style like I did in latticedialog.cpp (commented out)
doesn't work (gives me a blank widget...). Perhaps you have an idea.

CCMAIL:kalzium@kde.org

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=554591

19 years ago* Remove code which is now in OpenBabel2.1beta
Carsten Niehaus [Sat, 24 Jun 2006 11:06:00 +0000 (11:06 +0000)]
* Remove code which is now in OpenBabel2.1beta

svn path=/trunk/KDE/kdeedu/kalzium/src/openbabel2wrapper.cpp; revision=554558

19 years agoMake the atom-selection cooler and fix the low/high setting (was mixed up)
Carsten Niehaus [Sun, 18 Jun 2006 09:29:25 +0000 (09:29 +0000)]
Make the atom-selection cooler and fix the low/high setting (was mixed up)

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=552557

19 years agoCompile++
Laurent Montel [Sun, 18 Jun 2006 09:23:36 +0000 (09:23 +0000)]
Compile++

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=552554

19 years agoChanges by Benoit:
Carsten Niehaus [Sat, 17 Jun 2006 21:06:47 +0000 (21:06 +0000)]
Changes by Benoit:
 - implemented highlighting of selected atom (paints it in a blue color that is
   influenced by the original color)
 - now uses GLColor struct to handle color stuff
 - in big-spheres style, use smaller spheres (tell me what you think of this)
 - some slotChooseStylePreset reorganization

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=552456

19 years ago* If the user selects an atom in the QTreeWidget KalziumGLWidget will be
Carsten Niehaus [Sat, 17 Jun 2006 17:46:33 +0000 (17:46 +0000)]
* If the user selects an atom in the QTreeWidget KalziumGLWidget will be
  informed about that in

  void KalziumGLWidget::slotAtomSelected( OpenBabel::OBAtom* atom )

  Benoit: Please add you "atom-hightlight" code there, ok?

CCMAIL:jacob@math.jussieu.fr

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=552399

19 years ago* Fixing a crash
Carsten Niehaus [Sat, 17 Jun 2006 08:45:15 +0000 (08:45 +0000)]
* Fixing a crash
* Fixing the connections, now the styleselector works
* Fixing the quality-setting

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=552262

19 years ago* Many many changes by Benoit in the OpenGL-code
Carsten Niehaus [Sat, 17 Jun 2006 08:26:31 +0000 (08:26 +0000)]
* Many many changes by Benoit in the OpenGL-code

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=552261

19 years ago* Many UI-Changes
Carsten Niehaus [Sat, 17 Jun 2006 07:21:41 +0000 (07:21 +0000)]
* Many UI-Changes

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=552247

19 years agoone widget only, please!
Pino Toscano [Fri, 16 Jun 2006 18:41:11 +0000 (18:41 +0000)]
one widget only, please!

svn path=/trunk/KDE/kdeedu/kalzium/src/widgets/CMakeLists.txt; revision=552147

19 years agoand fix compilation for people with OpenBabel2 ;-)
Pino Toscano [Fri, 16 Jun 2006 16:22:21 +0000 (16:22 +0000)]
and fix compilation for people with OpenBabel2 ;-)

svn path=/trunk/KDE/kdeedu/kalzium/src/widgets/CMakeLists.txt; revision=552108

19 years agoFix compile
Laurent Montel [Fri, 16 Jun 2006 14:34:30 +0000 (14:34 +0000)]
Fix compile

svn path=/trunk/KDE/kdeedu/kalzium/src/widgets/CMakeLists.txt; revision=552066

19 years agoNow it compiles fine (need to fix a error when we re-try to compile it)
Laurent Montel [Fri, 16 Jun 2006 10:08:00 +0000 (10:08 +0000)]
Now it compiles fine (need to fix a error when we re-try to compile it)
works fine when we build after a make clean
I will fix it after eating

svn path=/trunk/KDE/kdeedu/kalzium/src/widgets/kalzium.widgets; revision=551984

19 years agoName fix
Carsten Niehaus [Fri, 16 Jun 2006 09:44:41 +0000 (09:44 +0000)]
Name fix

svn path=/trunk/KDE/kdeedu/kalzium/src/widgets/kalzium.widgets; revision=551977

19 years ago* Using M_PI and not a selfdefined pi.
Carsten Niehaus [Fri, 16 Jun 2006 09:23:32 +0000 (09:23 +0000)]
* Using M_PI and not a selfdefined pi.
* Update the view after the molecule has been changed
* Wouldn't it make sense to really only set m_molecule in the slotSetMolecule()
  and have a second slot/method in which  we'd recalculate things?

CCMAIL:jacob@math.jussieu.fr

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.cpp; revision=551968

19 years ago* It doesn't link but it is not compiled on default because for that
Carsten Niehaus [Thu, 15 Jun 2006 14:49:46 +0000 (14:49 +0000)]
* It doesn't link but it is not compiled on default because for that
  you need to add_subdir in the CMakeLists.txt in kalzium/src

svn path=/trunk/KDE/kdeedu/kalzium/src/widgets/kalzium.widgets; revision=551763

19 years ago* Add Benoit in the credit-section
Carsten Niehaus [Wed, 14 Jun 2006 16:59:18 +0000 (16:59 +0000)]
* Add Benoit in the credit-section
* Adding apidox and some compile warning-fixes
* Make use of the ui, well, the plugin still does not link and I have not the faintest idea why

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=551450

19 years agosome patches by Benoit in his opengl-code
Carsten Niehaus [Wed, 14 Jun 2006 14:32:06 +0000 (14:32 +0000)]
some patches by Benoit in his opengl-code

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=551384

19 years ago* Many OpenGL-Improvements
Carsten Niehaus [Wed, 14 Jun 2006 13:56:32 +0000 (13:56 +0000)]
* Many OpenGL-Improvements

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=551372

19 years agook, adding two more colours and also making the widget bigger
Carsten Niehaus [Mon, 12 Jun 2006 17:52:18 +0000 (17:52 +0000)]
ok, adding two more colours and also making the widget bigger

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.cpp; revision=550772

19 years agoAdd colours for the diffrent atom types :)
Carsten Niehaus [Mon, 12 Jun 2006 17:36:41 +0000 (17:36 +0000)]
Add colours for the diffrent atom types :)

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.cpp; revision=550767

19 years agoThis way we can test with real testfiles. Only problem: The path is still hardcoded
Carsten Niehaus [Mon, 12 Jun 2006 17:02:10 +0000 (17:02 +0000)]
This way we can test with real testfiles. Only problem: The path is still hardcoded

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.cpp; revision=550760

19 years ago* Ok, make the dialog more sane, adding some slots so that Benoit can continue
Carsten Niehaus [Mon, 12 Jun 2006 15:05:06 +0000 (15:05 +0000)]
* Ok, make the dialog more sane, adding some slots so that Benoit can continue
* Benoit: You'll notice some changes in the GL-classes. I added 2 members and 2 slots.
  In the moleculewidget I removed everything but the constructor. I hope that works
  fine for you :)

CCMAIL:jacob@math.jussieu.fr

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=550673

19 years agoMaking reading of chemical datafiles work. I created a small OB-wrapper to hide the...
Carsten Niehaus [Mon, 12 Jun 2006 13:23:30 +0000 (13:23 +0000)]
Making reading of chemical datafiles work. I created a small OB-wrapper to hide the ugly OB-API

svn path=/trunk/KDE/kdeedu/kalzium/src/openbabel2wrapper.cpp; revision=550626

19 years agoAs I also want to make the Crystalview OpenGL Benoit proposed to create a KalziumGL...
Carsten Niehaus [Sun, 11 Jun 2006 12:08:01 +0000 (12:08 +0000)]
As I also want to make the Crystalview OpenGL Benoit proposed to create a KalziumGL-widget, as both will use them

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=550283