From: vsr <vsr@opencascade.com>
Date: Fri, 21 Apr 2006 10:48:44 +0000 (+0000)
Subject: PAL12079
X-Git-Tag: mergeto_SALOME_3_17May06~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=32525d8cdf14a098e60c879f0019c98b099e677d;p=tools%2Finstall.git

PAL12079
---

diff --git a/bin/SALOME_InstallWizard b/bin/SALOME_InstallWizard
index b110116..cecf285 100755
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ
diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index 36737b4..657acd6 100644
--- a/src/SALOME_InstallWizard.cxx
+++ b/src/SALOME_InstallWizard.cxx
@@ -1364,17 +1364,15 @@ void SALOME_InstallWizard::checkProductPage()
   for ( itProd = productsMap.begin(); itProd != productsMap.end(); ++itProd ) {
     bool srcctx = itProd.data().hasContext( "salome sources" );
     bool binctx = itProd.data().hasContext( "salome binaries" );
-    if ( srcctx ) totSrc++;
-    if ( binctx ) totBin++;
-    if ( srcctx && !binctx && productsView->isSources( itProd.key() ) )
-      selSrc++;
-    if ( !srcctx && binctx && productsView->isBinaries( itProd.key() ) )
-      selBin++;
-    if ( srcctx && binctx && 
-	 ( productsView->isSources( itProd.key() ) || 
-	   productsView->isBinaries( itProd.key() ) ) ) {
-      selSrc++;
-      selBin++;
+    if ( srcctx && !binctx ) {
+      totSrc++;
+      if ( productsView->isSources( itProd.key() ) )
+	selSrc++;
+    }
+    if ( binctx && !srcctx ) {
+      totBin++;
+      if ( productsView->isBinaries( itProd.key() ) )
+	selBin++;
     }
   }
   selectSrcBtn->blockSignals( true );
@@ -2111,8 +2109,18 @@ void SALOME_InstallWizard::onProdBtn()
     MapProducts::Iterator itProd;
     for ( itProd = productsMap.begin(); itProd != productsMap.end(); ++itProd ) {
       if ( itProd.data().hasContext( "salome sources" ) ) {
-	if ( checkBox->state() == QButton::Off )
-	  productsView->setNone( itProd.key() );
+	if ( checkBox->state() == QButton::Off ) {
+	  int selBin = 0;
+	  MapProducts::Iterator itProd1;
+	  for ( itProd1 = productsMap.begin(); itProd1 != productsMap.end(); ++itProd1 ) {
+	    if (  itProd1.data().hasContext( "salome binaries" ) && 
+		 !itProd1.data().hasContext( "salome sources" ) &&
+		  productsView->isBinaries( itProd1.key() ) )
+	      selBin++;
+	  }
+	  if ( !itProd.data().hasContext( "salome binaries" ) || !selBin )
+	    productsView->setNone( itProd.key() );
+	}
 	else {
 	  productsView->setSources( itProd.key() );
 	  if ( prerequisites->isChecked() )
@@ -2128,8 +2136,18 @@ void SALOME_InstallWizard::onProdBtn()
     MapProducts::Iterator itProd;
     for ( itProd = productsMap.begin(); itProd != productsMap.end(); ++itProd ) {
       if ( itProd.data().hasContext( "salome binaries" ) ) {
-	if ( checkBox->state() == QButton::Off )
-	  productsView->setNone( itProd.key() );
+	if ( checkBox->state() == QButton::Off ) {
+	  int selSrc = 0;
+	  MapProducts::Iterator itProd1;
+	  for ( itProd1 = productsMap.begin(); itProd1 != productsMap.end(); ++itProd1 ) {
+	    if (  itProd1.data().hasContext( "salome sources" ) && 
+		 !itProd1.data().hasContext( "salome binaries" ) &&
+		  productsView->isSources( itProd1.key() ) )
+	      selSrc++;
+	  }
+	  if ( !itProd.data().hasContext( "salome sources" ) || !selSrc )
+	    productsView->setNone( itProd.key() );
+	}
 	else {
 	  productsView->setBinaries( itProd.key() );
 	  if ( prerequisites->isChecked() )