Changeset 584

Timestamp:

Sep 26, 2007, 12:17:22 PM (17 years ago)

Author:

garnier

Message:

r609@mac-90108: laurentgarnier | 2007-09-24 14:10:23 +0200
boite de dialogue presque ok, reste plus qu a connecter

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtExportDialog.hh (modified) (2 diffs)
• src/G4OpenGLQtExportDialog.cc (modified) (6 diffs)

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

@@ -59 +59 @@
 public slots:
   void changeSizeBox(bool);  
-  void keepRatio();  
+  void textWidthChanged(const QString &); 
+  void textHeightChanged(const QString &); 
 
 signals:
@@ -83 +84 @@
   int originalHeight;
 
-
 };
 

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

@@ -101 +101 @@
     BW->setChecked( false );
     
-    connect( color, SIGNAL( clicked() ), BW, SLOT( toogle() ) );
-    connect( BW, SIGNAL( clicked() ), color, SLOT( toogle() ) );
+    connect( color, SIGNAL( clicked() ), BW, SLOT( toggle() ) );
+    connect( BW, SIGNAL( clicked() ), color, SLOT( toggle() ) );
 
 
@@ -132 +132 @@
   }
 
-  // size box    
+  // size box
   QGroupBox *sizeGroupBox = new QGroupBox(tr("Size"));
   QVBoxLayout *sizeGroupBoxLayout = new QVBoxLayout;
   
+  QHBoxLayout *modifyAndRatioLayout = new QHBoxLayout;
+  QWidget* modifyAndRatioWidget = new QWidget;
+
+  // original button
   original = new QRadioButton("Original");
+  original->setChecked( true );
+  sizeGroupBoxLayout->addWidget(original);
+
+  // modify and ratio
   modify = new QRadioButton("Modify");
-  original->setChecked( true );
   modify->setChecked( false );
-  
-  sizeGroupBoxLayout->addWidget(original);
-  sizeGroupBoxLayout->addWidget(modify);
+
+  ratioCheckBox = new QCheckBox( "Keep ratio" );
+  ratioCheckBox->setChecked( true );
+
+  modifyAndRatioLayout->addWidget(modify);
+  modifyAndRatioLayout->addWidget(ratioCheckBox);
+  modifyAndRatioWidget->setLayout(modifyAndRatioLayout);
+  sizeGroupBoxLayout->addWidget(modifyAndRatioWidget);
+  ratioCheckBox->setVisible(modify->isChecked());
+
   connect( original, SIGNAL( clicked() ), modify, SLOT( toogle() ) );
   connect( modify, SIGNAL( clicked() ), original, SLOT( toogle() ) );
   connect( modify, SIGNAL( toggled(bool) ), this, SLOT( changeSizeBox(bool) ) );
 
+  // height
   QHBoxLayout *heightLineLayout = new QHBoxLayout;
   heightWidget = new QWidget;
@@ -155 +170 @@
   height->setMaxLength(5);
   heightLineLayout->addWidget(height);
-  ratioCheckBox = new QCheckBox( "Keep ratio" );
-  ratioCheckBox->setChecked( true );
-  heightLineLayout->addWidget(ratioCheckBox);
   heightWidget->setLayout(heightLineLayout);
   sizeGroupBoxLayout->addWidget(heightWidget);
-  connect( ratioCheckBox, SIGNAL( toogle() ), this, SLOT( keepRatio() ) );
-
+  connect( height, SIGNAL( textChanged ( const QString& ) ), this, SLOT( textHeightChanged(const QString &) ) );
+
+
+  // width
   QHBoxLayout *widthLineLayout = new QHBoxLayout;
   widthWidget = new QWidget;
@@ -171 +185 @@
   widthWidget->setLayout(widthLineLayout);
   sizeGroupBoxLayout->addWidget(widthWidget);
+  connect( width, SIGNAL( textChanged ( const QString& ) ), this, SLOT( textWidthChanged(const QString &) ) );
 
   sizeGroupBox->setLayout(sizeGroupBoxLayout);
@@ -178 +193 @@
   widthWidget->setVisible(false);
 
-    // button ok/cancel box
+  // button ok/cancel box
 
   QGroupBox *buttonGroupBox = new QGroupBox();
@@ -214 +229 @@
   heightWidget->setVisible(modify->isChecked());
   widthWidget->setVisible(modify->isChecked());
-}
-
-void G4OpenGLQtExportDialog::keepRatio()
-{
-}
-
+  ratioCheckBox->setVisible(modify->isChecked());
+}
+
+void G4OpenGLQtExportDialog::textWidthChanged(
+ const QString & s
+ )
+{
+  printf("new Width : %s\n",s.toStdString().c_str());
+  if (ratioCheckBox->isChecked()){
+    QString tmp;
+    width->setText(tmp.setNum(s.toInt()*originalHeight/originalHeight));
+  }
+}
+
+void G4OpenGLQtExportDialog::  textHeightChanged(
+ const QString & s
+)
+{
+  printf("new Height : %s\n",s.toStdString().c_str());
+  if (ratioCheckBox->isChecked()){
+    QString tmp;
+    width->setText(tmp.setNum(s.toInt()*originalWidth/originalWidth));
+  }
+} 
 
 G4OpenGLQtExportDialog::~G4OpenGLQtExportDialog()