Changeset 657 for trunk/geant4

Timestamp:

Dec 11, 2007, 6:23:04 PM (17 years ago)

Author:

garnier

Message:

amelioration pour le ticket #101

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtExportDialog.hh (modified) (3 diffs)
• src/G4OpenGLQtExportDialog.cc (modified) (7 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

@@ -45 +45 @@
 class QLabel;
 class QLineEdit;
+
+#if QT_VERSION >= 0x040000
+class QGroupBox;
+#endif
 
 /** The G4OpenGLQtExportDialog class provide a Dialog displaying differents options
@@ -111 +115 @@
   QPushButton* buttonOk;
   QPushButton* buttonCancel;
+
+#if QT_VERSION >= 0x040000
+  QGroupBox * sizeGroupBox;
+#endif
+
   QCheckBox* transparencyEPS,*boxTransparency,*vectorEPSCheckBox;
   QCheckBox* ratioCheckBox;
@@ -121 +130 @@
   int originalWidth;
   int originalHeight;
-
+  bool isChangingSize;
 };
 

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc

@@ -54 +54 @@
  ,int aWidth
 )
-  : QDialog( parent )
+  : QDialog( parent ),
+    isChangingSize(false)
 {
 #if QT_VERSION < 0x040000
@@ -130 +131 @@
 #else
   
-  QGroupBox * sizeGroupBox = new QGroupBox(tr("Size"));
+  sizeGroupBox = new QGroupBox(tr("Size"));
   QVBoxLayout *sizeGroupBoxLayout = new QVBoxLayout(sizeGroupBox);
   QButtonGroup * sizeButtonGroupBox = new QButtonGroup();
@@ -401 +402 @@
     modify->setEnabled ( true );
 #else
+    sizeGroupBox->show();
     original->show();
     modify->show();
@@ -413 +415 @@
     widthWidget->setEnabled ( false );
 #else
+    sizeGroupBox->hide();
     original->hide();
     modify->hide();
@@ -453 +456 @@
 }
 
+
 void G4OpenGLQtExportDialog::textWidthChanged(
  const QString & s
@@ -459 +463 @@
   if (!ratioCheckBox) return;
   if (!width) return;
+  if (isChangingSize == true) return; // exclusive slot
 
   if (ratioCheckBox->isChecked()){
+    isChangingSize = true;
     QString tmp;
-    height->setText(tmp.setNum(s.toInt()*originalHeight/originalWidth));
+  height->setText(tmp.setNum((int)(s.toInt()*(double)((double)originalHeight/(double)originalWidth))));
+  isChangingSize = false;
   }
 }
@@ -472 +479 @@
   if (!ratioCheckBox) return;
   if (!width) return;
+  if (isChangingSize == true) return; // exclusive slot
 
   if (ratioCheckBox->isChecked()){
+  isChangingSize = true;
     QString tmp;
     width->setText(tmp.setNum(s.toInt()*originalWidth/originalHeight));
+  isChangingSize = false;
   }
 }