[Kst] kdeextragear-2/kst/kst

[Rick Chern]

CVS commit by rchern: 

Update for window curvePlacement widget in image dialog, and readUnlock KST::dataObjectList before KstDataManagerI::update() tries to writeLock it


  M +1 -2      kst.cpp   1.201
  M +2 -5      kstimagedialog_i.cpp   1.17


--- kdeextragear-2/kst/kst/kst.cpp  #1.200:1.201
@@ -1264,4 +1264,5 @@ void KstApp::updateDialogsForWindow() {
     KstPsdDialogI::globalInstance()->updateWindow();
     KstCurveDialogI::globalInstance()->updateWindow();
+    KstImageDialogI::globalInstance()->updateWindow();
     dataManager->update();
     _plotDialog->updateWindow();

--- kdeextragear-2/kst/kst/kstimagedialog_i.cpp  #1.16:1.17
@@ -97,4 +97,5 @@ KstImagePtr KstImageDialogI::_getPtr(con
 
 void KstImageDialogI::updateWindow() {
+  _curvePlacement->update();
 }
 
@@ -243,10 +244,7 @@ bool KstImageDialogI::new_I() {
                          _numContourLines->text().toInt(), tempColor);
   }
-
   array->readUnlock();
-  placeInPlot(image);
-
   KST::dataObjectList.lock().readUnlock();
-
+  placeInPlot(image);
   KST::dataObjectList.lock().writeLock();
   KST::dataObjectList.append(image.data());